llvm-{4,5}: fix build by using older gcc on i686-linux

This is mainly to unblock 32-bit OpenGL.
This commit is contained in:
Vladimír Čunát 2017-11-12 14:50:20 +01:00
parent 9e7021c97d
commit 24f2e730a7
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -6114,11 +6114,15 @@ with pkgs;
cmake = cmake.override { isBootstrap = true; };
libxml2 = libxml2.override { pythonSupport = false; };
python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
});
llvmPackages_5 = callPackage ../development/compilers/llvm/5 {
llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({
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 { };