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:
Ivan Babrou 2021-03-17 21:01:44 -07:00 committed by zowoq
parent 7598a80b52
commit 2cf3641a5c

View File

@ -15,7 +15,7 @@
, CoreFoundation, Security , CoreFoundation, Security
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform , makeRustPlatform
, llvmPackages_5, llvm_11 , llvmPackages_11, llvm_11
} @ args: } @ args:
import ./default.nix { import ./default.nix {
@ -26,7 +26,7 @@ import ./default.nix {
llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvm_11.override { enableSharedLibraries = true; }; llvmSharedForTarget = pkgsBuildTarget.llvm_11.override { enableSharedLibraries = true; };
llvmBootstrapForDarwin = llvmPackages_5; llvmBootstrapForDarwin = llvmPackages_11;
# For use at runtime # For use at runtime
llvmShared = llvm_11.override { enableSharedLibraries = true; }; 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"])