diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-12-11 16:21:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 16:21:16 +0100 |
| commit | 70a8c379571e0b63a8486f84dde126c5feac55f9 (patch) | |
| tree | 90d27e46fd39a673402ddd728db2e5273e9f8a3d /platform/windows/detect.py | |
| parent | df2e3e3f7f66612e02f7c76efc39ebbc023e3432 (diff) | |
| parent | c320a822132223eba5b317314c5cdc001799d423 (diff) | |
Merge pull request #34227 from akien-mga/scons-mingw-split-libmodules
SCons: Add 'split_libmodules' option to workaround linker issue
Diffstat (limited to 'platform/windows/detect.py')
| -rw-r--r-- | platform/windows/detect.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index b37a21f37f..500736bd3f 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -151,14 +151,14 @@ def setup_msvc_auto(env): env['bits'] = '64' else: env['bits'] = '32' - print(" Found MSVC version %s, arch %s, bits=%s" % (env['MSVC_VERSION'], env['TARGET_ARCH'], env['bits'])) + print("Found MSVC version %s, arch %s, bits=%s" % (env['MSVC_VERSION'], env['TARGET_ARCH'], env['bits'])) if env['TARGET_ARCH'] in ('amd64', 'x86_64'): env["x86_libtheora_opt_vc"] = False def setup_mingw(env): """Set up env for use with mingw""" # Nothing to do here - print("Using Mingw") + print("Using MinGW") pass def configure_msvc(env, manual_msvc_config): @@ -294,7 +294,10 @@ def configure_mingw(env): ## Compiler configuration if (os.name == "nt"): - env['ENV']['TMP'] = os.environ['TMP'] # way to go scons, you can be so stupid sometimes + # Force splitting libmodules.a in multiple chunks to work around + # issues reaching the linker command line size limit, which also + # seem to induce huge slowdown for 'ar' (GH-30892). + env['split_libmodules'] = True else: env["PROGSUFFIX"] = env["PROGSUFFIX"] + ".exe" # for linux cross-compilation |