mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-13 20:27:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

[3.10] bpo-45881: Use CC from env first for cross building (GH-29752). (GH-29753)

Browse source 
Co-authored-by: Christian Heimes <christian@python.org>
This commit is contained in:
Christian Heimes 2021-11-27 22:14:05 +02:00 • committed by GitHub
parent 57100c86ba
commit 545aebd2ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
setup.py
View file

@ -86,6 +86,9 @@ CYGWIN = (HOST_PLATFORM == 'cygwin')
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 @@ class PyBuildExt(build_ext):
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 @@ class PyBuildExt(build_ext):
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 @@ class PyBuildExt(build_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 @@ class PyBuildExt(build_ext):
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 @@ class PyBuildExt(build_ext):
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 - </dev/null 2>%s 1>/dev/null' % (cc, tmpfile))
ret = run_command('%s -E -v - </dev/null 2>%s 1>/dev/null' % (CC, tmpfile))
is_gcc = False
is_clang = False
in_incdirs = False
@ -1876,9 +1878,6 @@ class PyBuildExt(build_ext):
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()