Skip to content

Commit

Permalink
build: use list for mutable retval rather than tuple
Browse files Browse the repository at this point in the history
We define `retval` as a tuple and then replace the tuple by "appending"
items with `+=` but that actually creates a new tuple every time.
Because it is intended to be mutable, use a list instead, then return a
tuple from the function, as it should be immutable outside the function.

PR-URL: #41372
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
  • Loading branch information
Trott authored and targos committed Jan 14, 2022
1 parent 0768302 commit 80a3766
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ def pkg_config(pkg):
otherwise (None, None, None, None)"""
pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
args = [] # Print pkg-config warnings on first round.
retval = ()
retval = []
for flag in ['--libs-only-l', '--cflags-only-I',
'--libs-only-L', '--modversion']:
args += [flag]
Expand All @@ -843,9 +843,9 @@ def pkg_config(pkg):
except OSError as e:
if e.errno != errno.ENOENT: raise e # Unexpected error.
return (None, None, None, None) # No pkg-config/pkgconf installed.
retval += (val,)
retval.append(val)
args = ['--silence-errors']
return retval
return tuple(retval)


def try_check_compiler(cc, lang):
Expand Down

0 comments on commit 80a3766

Please sign in to comment.