From 3b12daa10d39146b8bd0ca86ca89a34e707ffd7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 26 Apr 2021 13:34:35 +0200 Subject: [PATCH] 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 aa15ad72ee4c80d3e3af959a74ae1fbbf58f48d2) --- platform/x11/detect.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 1a52044150..91652aad55 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -389,10 +389,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"