diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-27 10:21:37 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-27 10:21:37 -0500 |
commit | ee35de1861fa37c968619b3868a6a0e5b8caa949 (patch) | |
tree | ee16995b606b6745c2c0591a28e4e7bba74cbd47 /pkgs/top-level | |
parent | fd901586cbb7f3e563a6fda33f39390e3d8bb7ab (diff) | |
download | nixlib-ee35de1861fa37c968619b3868a6a0e5b8caa949.tar nixlib-ee35de1861fa37c968619b3868a6a0e5b8caa949.tar.gz nixlib-ee35de1861fa37c968619b3868a6a0e5b8caa949.tar.bz2 nixlib-ee35de1861fa37c968619b3868a6a0e5b8caa949.tar.lz nixlib-ee35de1861fa37c968619b3868a6a0e5b8caa949.tar.xz nixlib-ee35de1861fa37c968619b3868a6a0e5b8caa949.tar.zst nixlib-ee35de1861fa37c968619b3868a6a0e5b8caa949.zip |
llvm7: build with gcc6 on 32-bit linux
Need to use buildPackages.stdenv.cc.isGNU to avoid infinite recursion. We probably need a better way to handle this. Fixes #56457
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50a93da4aa14..5b231ba0c9fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7389,11 +7389,13 @@ in stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); - llvmPackages_7 = callPackage ../development/compilers/llvm/7 { + llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; - }; + } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); llvmPackages_latest = llvmPackages_7; |