Skip to content

build: use list for mutable retval rather than tuple #41372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 2 commits into from
Jan 5, 2022
Merged

build: use list for mutable retval rather than tuple #41372

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68cc26e
build: use list for mutable retval rather than tuple
Trott Jan 1, 2022
277dc43
Update configure.py
Trott Jan 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
build: use list for mutable retval rather than tuple 
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.
  • Loading branch information
@Trott
Trott committed Jan 1, 2022
commit 68cc26e430ea3ed90865296275a3cc7adfa419f5
6 changes: 3 additions & 3 deletions configure.py
View file
Open in desktop
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 = []
Comment thread
Trott marked this conversation as resolved.
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 += [val]
Comment thread
Trott marked this conversation as resolved.
Outdated
args = ['--silence-errors']
return retval
return tuple(retval)


def try_check_compiler(cc, lang):
Expand Down