diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2021-04-26 13:34:35 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2021-04-26 13:34:55 +0200 |
| commit | aa15ad72ee4c80d3e3af959a74ae1fbbf58f48d2 (patch) | |
| tree | 792ae51319d9de87a98b4659daaa0a64b5ee7845 /platform/linuxbsd | |
| parent | f6e5ea774ba071e995a2c7a3f225285d9e708c5a (diff) | |
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.
Diffstat (limited to 'platform/linuxbsd')
| -rw-r--r-- | platform/linuxbsd/detect.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index 646ae4d457..adbbcaac31 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -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" |