diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-22 00:20:51 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-22 00:20:51 +0100 |
commit | 4f79874f5708b16dbf03b80af5f47fd61c9d116d (patch) | |
tree | d9974ed914e37c7865c7ac7504cf1514ad203966 /pkgs | |
parent | b5391b24518a5697f1f0489ace2e44f9c4015b2e (diff) | |
download | nixlib-4f79874f5708b16dbf03b80af5f47fd61c9d116d.tar nixlib-4f79874f5708b16dbf03b80af5f47fd61c9d116d.tar.gz nixlib-4f79874f5708b16dbf03b80af5f47fd61c9d116d.tar.bz2 nixlib-4f79874f5708b16dbf03b80af5f47fd61c9d116d.tar.lz nixlib-4f79874f5708b16dbf03b80af5f47fd61c9d116d.tar.xz nixlib-4f79874f5708b16dbf03b80af5f47fd61c9d116d.tar.zst nixlib-4f79874f5708b16dbf03b80af5f47fd61c9d116d.zip |
llvm_*: fix build by using older gcc on i686-linux
Tested all builds before and after.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5349ccb23ce3..af00f82e7f69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6429,29 +6429,41 @@ with pkgs; stdenv = libcxxStdenv; }; - llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 { + llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 ({ 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; - }; + } // 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; - }; + } // 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; - }; + } // 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; - }; + } // 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; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; + }); llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ inherit (stdenvAdapters) overrideCC; |