Selaa lähdekoodia

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)
Rémi Verschelde 4 vuotta sitten
vanhempi
commit
3b12daa10d
1 muutettua tiedostoa jossa 1 lisäystä ja 4 poistoa
  1. 1 4
      platform/x11/detect.py

+ 1 - 4
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"