Merge pull request #163044 from symphorien/c++20-i686

pkgsi686Linux.gccForLibs: use recent gcc
2022-03-12 21:28:51 +00:00
parent d31e17cfeb 33f32d0076
commit 5e540d6ee6
1 changed files with 1 additions and 4 deletions
@@ -14810,10 +14810,7 @@ with pkgs;

  # This is for e.g. LLVM libraries on linux.
  gccForLibs =
-    # with gcc-7: undefined reference to `__divmoddi4'
-    if stdenv.targetPlatform.isi686
-      then gcc6.cc
-    else if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU
+    if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU
    # Can only do this is in the native case, otherwise we might get infinite
    # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`.
      then targetPackages.stdenv.cc.cc