asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #91656 from akien-mga/3.x-scons-windows-mingw-TypeError

Browse source 
[3.x] SCons: Fix Windows/MinGW TypeError with recent SCons
This commit is contained in:
Rémi Verschelde 2024-05-30 16:07:31 +02:00 committed by GitHub
commit 39b35c6194
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
methods.py
View file

@ -554,13 +554,15 @@ def split_lib(self, libname, src_list=None, env_lib=None):
# As SCons doesn't give us much control over how inserting libs in LIBS # As SCons doesn't give us much control over how inserting libs in LIBS
# impacts the linker call, we need to hack our way into the linking commands # impacts the linker call, we need to hack our way into the linking commands
# LINKCOM and SHLINKCOM to set those flags. # LINKCOM and SHLINKCOM to set those flags.
linkcom = str(env["LINKCOM"])
shlinkcom = str(env["SHLINKCOM"])
if "-Wl,--start-group" in env["LINKCOM"] and "-Wl,--start-group" in env["SHLINKCOM"]: if "-Wl,--start-group" in linkcom and "-Wl,--start-group" in shlinkcom:
# Already added by a previous call, skip. # Already added by a previous call, skip.
return return
env["LINKCOM"] = str(env["LINKCOM"]).replace("$_LIBFLAGS", "-Wl,--start-group $_LIBFLAGS -Wl,--end-group") env["LINKCOM"] = linkcom.replace("$_LIBFLAGS", "-Wl,--start-group $_LIBFLAGS -Wl,--end-group")
env["SHLINKCOM"] = str(env["LINKCOM"]).replace("$_LIBFLAGS", "-Wl,--start-group $_LIBFLAGS -Wl,--end-group") env["SHLINKCOM"] = shlinkcom.replace("$_LIBFLAGS", "-Wl,--start-group $_LIBFLAGS -Wl,--end-group")
def save_active_platforms(apnames, ap): def save_active_platforms(apnames, ap):