From 8bff1041149f8b8ebfe0aff27d5a34426fea16e5 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 31 Aug 2019 21:13:08 +0000 Subject: [PATCH] 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 ``` --- pkgs/development/compilers/rust/rustc.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 8a7d680010df..ceaf6f4c2258 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;