hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #48210 from akien-mga/linux-static_cpp-32-bit

Browse source 
Linux: Remove use_static_cpp override on x86_32
This commit is contained in:
Rémi Verschelde 2021-04-27 13:43:50 +02:00 • committed by GitHub
commit eb74784839
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
platform/linuxbsd/detect.py
View file

@ -408,10 +408,7 @@ def configure(env):
# Link those statically for portability
if env["use_static_cpp"]:
# Workaround for GH-31743, Ubuntu 18.04 i386 crashes when it's used.
# That doesn't make any sense but it's likely a Ubuntu bug?
if is64 or env["bits"] == "64":
env.Append(LINKFLAGS=["-static-libgcc", "-static-libstdc++"])
env.Append(LINKFLAGS=["-static-libgcc", "-static-libstdc++"])
if env["use_llvm"]:
env["LINKCOM"] = env["LINKCOM"] + " -l:libatomic.a"