diff options
| author | Konrad Borowski <konrad@borowski.pw> | 2020-07-22 18:03:31 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:53:00 +0000 |
| commit | 7382e2d536aa212567f358e4e2179b74d2a8b283 (patch) | |
| tree | 1ed3d831a51d996a99efbe0dac22be7284ef56d7 /nixpkgs | |
| parent | 4a5fb723dd9dac91f5744583ea76ada8955808b0 (diff) | |
| download | nixlib-7382e2d536aa212567f358e4e2179b74d2a8b283.tar nixlib-7382e2d536aa212567f358e4e2179b74d2a8b283.tar.gz nixlib-7382e2d536aa212567f358e4e2179b74d2a8b283.tar.bz2 nixlib-7382e2d536aa212567f358e4e2179b74d2a8b283.tar.lz nixlib-7382e2d536aa212567f358e4e2179b74d2a8b283.tar.xz nixlib-7382e2d536aa212567f358e4e2179b74d2a8b283.tar.zst nixlib-7382e2d536aa212567f358e4e2179b74d2a8b283.zip | |
rustc: use LLVM 10
Fixes rust-lang/rust#74585 (cherry picked from commit 41d681c85fee54549ba54a0f56705424cf837e7c)
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/rust/rustc.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 40de5f61e034..6b3d973f6dce 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , fetchurl, file, python3 -, llvm_9, darwin, cmake, rust, rustPlatform +, llvm_10, darwin, cmake, rust, rustPlatform , pkgconfig, openssl , which, libffi , withBundledLLVM ? false @@ -14,12 +14,12 @@ let inherit (stdenv.lib) optionals optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; - llvmSharedForBuild = pkgsBuildBuild.llvm_9.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvm_9.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvm_9.override { enableSharedLibraries = true; }; + llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvm_10.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvm_10.override { enableSharedLibraries = true; }; # For use at runtime - llvmShared = llvm_9.override { enableSharedLibraries = true; }; + llvmShared = llvm_10.override { enableSharedLibraries = true; }; in stdenv.mkDerivation rec { pname = "rustc"; inherit version; |