From 6a533a423869e28d9086cf4d79029f59e9eec916 Mon Sep 17 00:00:00 2001 From: andrei kulakov Date: Mon, 18 Oct 2021 14:26:23 -0400 Subject: [PATCH] bpo-45221: Fix handling of LDFLAGS and CPPFLAGS options in setup.py (GH-29031) --- .../Build/2021-10-18-10-25-56.bpo-45221.rnulhf.rst | 3 +++ setup.py | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 Misc/NEWS.d/next/Build/2021-10-18-10-25-56.bpo-45221.rnulhf.rst diff --git a/Misc/NEWS.d/next/Build/2021-10-18-10-25-56.bpo-45221.rnulhf.rst b/Misc/NEWS.d/next/Build/2021-10-18-10-25-56.bpo-45221.rnulhf.rst new file mode 100644 index 00000000000000..cb981d96f3047a --- /dev/null +++ b/Misc/NEWS.d/next/Build/2021-10-18-10-25-56.bpo-45221.rnulhf.rst @@ -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. diff --git a/setup.py b/setup.py index 24365ef3d927ba..5428cbde1cc9b0 100644 --- a/setup.py +++ b/setup.py @@ -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):