From 33f32d0076a89548d8b36115cf9d308a42f8e68b Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 6 Mar 2022 12:00:00 +0000 Subject: [PATCH] pkgsi686Linux.gccForLibs: use recent gcc the build failure seems to have disappeared on gcc10, and this is required to get recent c++ support in libstdc++. --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bc874b8c879..6ed811e84611 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14739,10 +14739,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