mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
rustc: update llvm on darwin to current
We downgraded when LLVM 10 wasn't working well on Darwin: #101136. Now that we're using LLVM 11, the issue is no longer present.
This commit is contained in:
parent
7598a80b52
commit
2cf3641a5c
@ -15,7 +15,7 @@
|
||||
, CoreFoundation, Security
|
||||
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
|
||||
, makeRustPlatform
|
||||
, llvmPackages_5, llvm_11
|
||||
, llvmPackages_11, llvm_11
|
||||
} @ args:
|
||||
|
||||
import ./default.nix {
|
||||
@ -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; };
|
||||
@ -54,4 +54,4 @@ import ./default.nix {
|
||||
];
|
||||
}
|
||||
|
||||
(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_11"])
|
||||
(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvm_11"])
|
||||
|
Loading…
Reference in New Issue
Block a user