summary refs log tree commit diff
path: root/pkgs/development/compilers/rust
diff options
context:
space:
mode:
authorLuka Blaskovic <lblasc@tvbeat.com>2019-08-31 21:13:08 +0000
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-11-12 14:50:49 +0100
commit8bff1041149f8b8ebfe0aff27d5a34426fea16e5 (patch)
tree4756479b8297fe188890d2e661b13857186a9601 /pkgs/development/compilers/rust
parent3e267ad39b2b4a412509f43afc80294b7dd05852 (diff)
downloadnixpkgs-8bff1041149f8b8ebfe0aff27d5a34426fea16e5.tar
nixpkgs-8bff1041149f8b8ebfe0aff27d5a34426fea16e5.tar.gz
nixpkgs-8bff1041149f8b8ebfe0aff27d5a34426fea16e5.tar.bz2
nixpkgs-8bff1041149f8b8ebfe0aff27d5a34426fea16e5.tar.lz
nixpkgs-8bff1041149f8b8ebfe0aff27d5a34426fea16e5.tar.xz
nixpkgs-8bff1041149f8b8ebfe0aff27d5a34426fea16e5.tar.zst
nixpkgs-8bff1041149f8b8ebfe0aff27d5a34426fea16e5.zip
rustc: bump runtime LLVM to match upstream
```
rustc 1.38.0
binary: rustc
commit-hash: unknown
commit-date: unknown
host: x86_64-unknown-linux-gnu
release: 1.38.0
LLVM version: 9.0
```
Diffstat (limited to 'pkgs/development/compilers/rust')
-rw-r--r--pkgs/development/compilers/rust/rustc.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 8a7d680010d..ceaf6f4c225 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,6 +1,6 @@
 { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
 , fetchurl, file, python2
-, llvm_7, darwin, git, cmake, rustPlatform
+, llvm_9, darwin, git, cmake, rustPlatform
 , pkgconfig, openssl
 , which, libffi
 , withBundledLLVM ? false
@@ -12,12 +12,12 @@ let
   inherit (stdenv.lib) optional optionalString;
   inherit (darwin.apple_sdk.frameworks) Security;
 
-  llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; };
-  llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; };
-  llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; };
+  llvmSharedForBuild = pkgsBuildBuild.llvm_9.override { enableSharedLibraries = true; };
+  llvmSharedForHost = pkgsBuildHost.llvm_9.override { enableSharedLibraries = true; };
+  llvmSharedForTarget = pkgsBuildTarget.llvm_9.override { enableSharedLibraries = true; };
 
   # For use at runtime
-  llvmShared = llvm_7.override { enableSharedLibraries = true; };
+  llvmShared = llvm_9.override { enableSharedLibraries = true; };
 in stdenv.mkDerivation rec {
   pname = "rustc";
   inherit version;