diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7053ab77cb..9226cd30f87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6539,9 +6539,12 @@ with pkgs; stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); - llvmPackages_6 = callPackage ../development/compilers/llvm/6 { + llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({ inherit (stdenvAdapters) overrideCC; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); + manticore = callPackage ../development/compilers/manticore { }; mentorToolchains = recurseIntoAttrs (