diff options
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 064e1836b17c9..ed2b291ca2a1b 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -66,7 +66,7 @@ in lib.init bootStages ++ [ else if crossSystem.isDarwin then buildPackages.llvmPackages.clang else if crossSystem.useLLVM or false - then buildPackages.llvmPackages_8.lldClang + then buildPackages.llvmPackages.lldClang else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6824961426791..bdad1be04e314 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9946,7 +9946,17 @@ in llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; - llvmPackages = recurseIntoAttrs llvmPackages_7; + llvmPackages = recurseIntoAttrs (with targetPlatform; + if isDarwin then + llvmPackages_7 + else if isFreeBSD then + llvmPackages_7 + else if isLinux then + llvmPackages_7 + else if isWasm then + llvmPackages_8 + else + llvmPackages_latest); llvmPackages_5 = callPackage ../development/compilers/llvm/5 { inherit (stdenvAdapters) overrideCC; |