From 545aebd2ecef9f6c3b2ca1973e3e0515d8355ce3 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Sat, 27 Nov 2021 22:14:05 +0200 Subject: [PATCH] [3.10] bpo-45881: Use CC from env first for cross building (GH-29752). (GH-29753) Co-authored-by: Christian Heimes --- .../2021-11-24-17-14-06.bpo-45881.GTXXLk.rst | 2 ++ setup.py | 19 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2021-11-24-17-14-06.bpo-45881.GTXXLk.rst diff --git a/Misc/NEWS.d/next/Build/2021-11-24-17-14-06.bpo-45881.GTXXLk.rst b/Misc/NEWS.d/next/Build/2021-11-24-17-14-06.bpo-45881.GTXXLk.rst new file mode 100644 index 00000000000000..b697658cf3aaa3 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2021-11-24-17-14-06.bpo-45881.GTXXLk.rst @@ -0,0 +1,2 @@ +``setup.py`` now uses ``CC`` from environment first to discover multiarch +and cross compile paths. diff --git a/setup.py b/setup.py index 4802b6dd3e5e6b..43e807f20d9895 100644 --- a/setup.py +++ b/setup.py @@ -86,6 +86,9 @@ def get_platform(): MACOS = (HOST_PLATFORM == 'darwin') AIX = (HOST_PLATFORM.startswith('aix')) VXWORKS = ('vxworks' in HOST_PLATFORM) +CC = os.environ.get("CC") +if not CC: + CC = sysconfig.get_config_var("CC") SUMMARY = """ @@ -467,6 +470,9 @@ def set_compiler_executables(self): def build_extensions(self): self.set_srcdir() + self.set_compiler_executables() + self.configure_compiler() + self.init_inc_lib_dirs() # Detect which modules should be compiled self.detect_modules() @@ -476,7 +482,6 @@ def build_extensions(self): self.update_sources_depends() mods_built, mods_disabled = self.remove_configured_extensions() - self.set_compiler_executables() if LIST_MODULE_NAMES: for ext in self.extensions: @@ -662,12 +667,11 @@ def check_extension_import(self, ext): def add_multiarch_paths(self): # Debian/Ubuntu multiarch support. # https://wiki.ubuntu.com/MultiarchSpec - cc = sysconfig.get_config_var('CC') tmpfile = os.path.join(self.build_temp, 'multiarch') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = run_command( - '%s -print-multiarch > %s 2> /dev/null' % (cc, tmpfile)) + '%s -print-multiarch > %s 2> /dev/null' % (CC, tmpfile)) multiarch_path_component = '' try: if ret == 0: @@ -729,11 +733,10 @@ def add_search_path(line): d = os.path.normpath(d) add_dir_to_list(self.compiler.library_dirs, d) - cc = sysconfig.get_config_var('CC') tmpfile = os.path.join(self.build_temp, 'wrccpaths') os.makedirs(self.build_temp, exist_ok=True) try: - ret = run_command('%s --print-search-dirs >%s' % (cc, tmpfile)) + ret = run_command('%s --print-search-dirs >%s' % (CC, tmpfile)) if ret: return with open(tmpfile) as fp: @@ -751,11 +754,10 @@ def add_search_path(line): pass def add_cross_compiling_paths(self): - cc = sysconfig.get_config_var('CC') tmpfile = os.path.join(self.build_temp, 'ccpaths') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) - ret = run_command('%s -E -v - %s 1>/dev/null' % (cc, tmpfile)) + ret = run_command('%s -E -v - %s 1>/dev/null' % (CC, tmpfile)) is_gcc = False is_clang = False in_incdirs = False @@ -1876,9 +1878,6 @@ def detect_uuid(self): self.missing.append('_uuid') def detect_modules(self): - self.configure_compiler() - self.init_inc_lib_dirs() - self.detect_simple_extensions() if TEST_EXTENSIONS: self.detect_test_extensions()