Linux: Remove use_static_cpp override on x86_32
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 #45629.
(cherry picked from commit aa15ad72ee
)
This commit is contained in:
parent
1ba636ee4a
commit
3b12daa10d
1 changed files with 1 additions and 4 deletions
|
@ -389,9 +389,6 @@ 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++"])
|
||||
if env["use_llvm"]:
|
||||
env["LINKCOM"] = env["LINKCOM"] + " -l:libatomic.a"
|
||||
|
|
Loading…
Reference in a new issue