Skip to content

Commit

Permalink
bpo-45221: Fix handling of LDFLAGS and CPPFLAGS options in setup.py (p…
Browse files Browse the repository at this point in the history
  • Loading branch information
akulakov authored Oct 18, 2021
1 parent 034f607 commit 6a533a4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -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 changes: 12 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,18 @@ def add_ldflags_cppflags(self):
if env_val:
parser = argparse.ArgumentParser()
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())
if options.dirs:
for directory in reversed(options.dirs):
Expand Down

0 comments on commit 6a533a4

Please sign in to comment.