|
- diff -Naur Python-3.8.0-orig/Lib/distutils/command/build_ext.py Python-3.8.0/Lib/distutils/command/build_ext.py
- --- Python-3.8.0-orig/Lib/distutils/command/build_ext.py 2019-10-14 16:34:47.000000000 +0300
- +++ Python-3.8.0/Lib/distutils/command/build_ext.py 2019-10-22 10:01:53.789636600 +0300
- @@ -186,7 +186,7 @@
- # for extensions under windows use different directories
- # for Release and Debug builds.
- # also Python's library directory must be appended to library_dirs
- - if os.name == 'nt':
- + if os.name == 'nt' and not self.plat_name.startswith(('mingw')):
- # the 'libs' directory is for binary installs - we assume that
- # must be the *native* platform. But we don't really support
- # cross-compiling via a binary install anyway, so we let it go.
- @@ -703,6 +703,20 @@
- # pyconfig.h that MSVC groks. The other Windows compilers all seem
- # to need it mentioned explicitly, though, so that's what we do.
- # Append '_d' to the python import library on debug builds.
- +
- + # Use self.plat_name as it works even in case of
- + # cross-compilation (at least for mingw build).
- + if self.plat_name.startswith('mingw'):
- + from distutils import sysconfig
- + extra = []
- + for lib in (
- + sysconfig.get_config_var('BLDLIBRARY').split()
- + + sysconfig.get_config_var('SHLIBS').split()
- + ):
- + if lib.startswith('-l'):
- + extra.append(lib[2:])
- + return ext.libraries + extra
- +
- if sys.platform == "win32":
- from distutils._msvccompiler import MSVCCompiler
- if not isinstance(self.compiler, MSVCCompiler):
- diff -Naur Python-3.8.0-orig/Lib/distutils/util.py Python-3.8.0/Lib/distutils/util.py
- --- Python-3.8.0-orig/Lib/distutils/util.py 2019-10-14 16:34:47.000000000 +0300
- +++ Python-3.8.0/Lib/distutils/util.py 2019-10-22 10:01:54.210837300 +0300
- @@ -36,6 +36,8 @@
-
- """
- if os.name == 'nt':
- + if 'GCC' in sys.version:
- + return 'mingw'
- if 'amd64' in sys.version.lower():
- return 'win-amd64'
- if '(arm)' in sys.version.lower():
- diff -Naur Python-3.8.0-orig/Lib/sysconfig.py Python-3.8.0/Lib/sysconfig.py
- --- Python-3.8.0-orig/Lib/sysconfig.py 2019-10-22 10:00:21.731874800 +0300
- +++ Python-3.8.0/Lib/sysconfig.py 2019-10-22 10:01:54.600838000 +0300
- @@ -643,6 +643,8 @@
-
- """
- if os.name == 'nt':
- + if 'GCC' in sys.version:
- + return 'mingw'
- if 'amd64' in sys.version.lower():
- return 'win-amd64'
- if '(arm)' in sys.version.lower():
|
