MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

llvm7: build with gcc6 on 32-bit linux

Browse source 
Need to use buildPackages.stdenv.cc.isGNU to avoid infinite recursion.
We probably need a better way to handle this.

Fixes #56457
This commit is contained in:
Matthew Bauer 2019-02-27 10:21:37 -05:00
parent fd901586cb
commit ee35de1861
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

@ -7389,11 +7389,13 @@ in
stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' 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; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_7.tools; buildLlvmTools = buildPackages.llvmPackages_7.tools;
targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; 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; llvmPackages_latest = llvmPackages_7;