llvm6: default to gcc7 instead of gcc8

This commit is contained in:
Patrick Hilhorst 2018-05-16 11:25:34 +02:00
parent da5a692fcd
commit 479f6960d8
No known key found for this signature in database
GPG key ID: 589BB0A8DAFEF2B2

View file

@ -6706,8 +6706,10 @@ with pkgs;
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'
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU) {
stdenv = overrideCC stdenv (if stdenv.hostPlatform.isi686 then gcc6 else gcc7);
# with gcc-7 on i686: undefined reference to `__divmoddi4'
# Failing tests with gcc8.
});
manticore = callPackage ../development/compilers/manticore { };