diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-11 20:51:48 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-11 21:28:51 -0400 |
| commit | d453273fbf86ff1526094a84b01ef8fb9fad98e3 (patch) | |
| tree | 9f35a286675c3ca58c84f5b4ab40fe3ee33ce18f /pkgs/stdenv/cross/default.nix | |
| parent | d0506bed9f8218f7d09e0c3f439424ff64086011 (diff) | |
| download | nixpkgs-d453273fbf86ff1526094a84b01ef8fb9fad98e3.tar nixpkgs-d453273fbf86ff1526094a84b01ef8fb9fad98e3.tar.gz nixpkgs-d453273fbf86ff1526094a84b01ef8fb9fad98e3.tar.bz2 nixpkgs-d453273fbf86ff1526094a84b01ef8fb9fad98e3.tar.lz nixpkgs-d453273fbf86ff1526094a84b01ef8fb9fad98e3.tar.xz nixpkgs-d453273fbf86ff1526094a84b01ef8fb9fad98e3.tar.zst nixpkgs-d453273fbf86ff1526094a84b01ef8fb9fad98e3.zip | |
llvm8: support c++ in cross case
this adds libc++ to the LLVM cross, giving us access to the full Nixpkgs set. This requires 4 stages of wrapped compilers: - Clang with no libraries - Clang with just compiler-rt - Clang with Libc, and compiler-rt - Clang with Libc++, Libc, and compiler-rt
Diffstat (limited to 'pkgs/stdenv/cross/default.nix')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 43198f4e913..fc9a585cf4d 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -55,7 +55,7 @@ in lib.init bootStages ++ [ else if crossSystem.useAndroidPrebuilt or false then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".clang else if crossSystem.useLLVM or false - then buildPackages.llvmPackages_7.lldClang + then buildPackages.llvmPackages_8.lldClang else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs |