Skip to content

Commit

Permalink
Linux: Remove use_static_cpp override on x86_32
Browse files Browse the repository at this point in the history
After further testing it seems to work fine now when building binaries with GCC 5
on Ubuntu 16.04 (previously we were using GCC 9 on Ubuntu 14.04).

Follow-up to godotengine#45629.
  • Loading branch information
akien-mga committed Apr 26, 2021
1 parent f6e5ea7 commit aa15ad7
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions platform/linuxbsd/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit aa15ad7

Please sign in to comment.