Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.10] bpo-45221: Fix handling of LDFLAGS and CPPFLAGS options in setup.py (GH-29031) (GH-29037)

Browse source 
(cherry picked from commit 6a533a4238)


Co-authored-by: andrei kulakov <andrei.avk@gmail.com>

Automerge-Triggered-By: GH:ned-deily
This commit is contained in:
Miss Islington (bot) 2021-10-18 11:49:28 -07:00 • committed by GitHub
parent 7082abf53d
commit b1949e0b58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS.d/next/Build/2021-10-18-10-25-56.bpo-45221.rnulhf.rst Normal file
View file

@ -0,0 +1,3 @@
Fixed regression in handling of ``LDFLAGS`` and ``CPPFLAGS`` options
where :meth:`argparse.parse_known_args` could interpret an option as
one of the built-in command line argument, for example ``-h`` for help.

12
setup.py
View file

@ -801,6 +801,18 @@ def add_ldflags_cppflags(self):
if env_val: if env_val:
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument(arg_name, dest="dirs", action="append") parser.add_argument(arg_name, dest="dirs", action="append")
# To prevent argparse from raising an exception about any
# options in env_val that it mistakes for known option, we
# strip out all double dashes and any dashes followed by a
# character that is not for the option we are dealing with.
#
# Please note that order of the regex is important! We must
# strip out double-dashes first so that we don't end up with
# substituting "--Long" to "-Long" and thus lead to "ong" being
# used for a library directory.
env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1],
' ', env_val)
options, _ = parser.parse_known_args(env_val.split()) options, _ = parser.parse_known_args(env_val.split())
if options.dirs: if options.dirs:
for directory in reversed(options.dirs): for directory in reversed(options.dirs):