cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #40592 from Synthetica9/gcc8-llvm6-revert

Browse source 
llvm6: default to gcc7 instead of gcc8
This commit is contained in:
Matthew Justin Bauer 2018-05-16 09:56:34 -05:00 committed by GitHub
commit 283a61a800
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View file

@ -6728,8 +6728,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 { };