public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvm_*: fix build by using older gcc on i686-linux 

Tested all builds before and after.
This commit is contained in:
Vladimír Čunát 2018-02-22 00:20:51 +01:00
parent b5391b2451
commit 4f79874f57
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/top-level/all-packages.nix
View File

@ -6429,29 +6429,41 @@ with pkgs;
stdenv = libcxxStdenv; stdenv = libcxxStdenv;
}; };
llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 { llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 ({
isl = isl_0_12; isl = isl_0_12;
}; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6;
});
llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 { llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({
isl = isl_0_14; isl = isl_0_14;
}; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6;
});
llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 { llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
}; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6;
});
llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 { llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
}; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6;
});
llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 { llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
}; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6;
});
llvmPackages_4 = callPackage ../development/compilers/llvm/4 { llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
}; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6;
});
llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;