Skip to content

Commit

Permalink
rustc: update llvm on darwin to current
Browse files Browse the repository at this point in the history
We downgraded when LLVM 10 wasn't working well on Darwin: NixOS#101136.
Now that we're using LLVM 11, the issue is no longer present.

(cherry picked from commit df2cdfa)
  • Loading branch information
bobrik authored and thefloweringash committed Mar 18, 2021
1 parent 3baef40 commit 2c2510c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/development/compilers/rust/1_50.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
, CoreFoundation, Security
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform
, llvmPackages_5, llvm_11
, llvmPackages_11, llvm_11
} @ args:

import ./default.nix {
Expand All @@ -26,7 +26,7 @@ import ./default.nix {
llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvm_11.override { enableSharedLibraries = true; };

llvmBootstrapForDarwin = llvmPackages_5;
llvmBootstrapForDarwin = llvmPackages_11;

# For use at runtime
llvmShared = llvm_11.override { enableSharedLibraries = true; };
Expand Down Expand Up @@ -55,4 +55,4 @@ import ./default.nix {
];
}

(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_11"])
(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvm_11"])

0 comments on commit 2c2510c

Please sign in to comment.