diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-27 13:43:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 13:43:50 +0200 |
| commit | eb747848391a363dbda014c4c3e7ec2757633aa0 (patch) | |
| tree | c5d3b8cd51f33477a1bb84b99a93c8fcdc0f72c1 /platform | |
| parent | 3a0cfd3d85859da22f5b2e0a1c2800f18e9687aa (diff) | |
| parent | aa15ad72ee4c80d3e3af959a74ae1fbbf58f48d2 (diff) | |
Merge pull request #48210 from akien-mga/linux-static_cpp-32-bit
Linux: Remove use_static_cpp override on x86_32
Diffstat (limited to 'platform')
| -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" |