JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rustc: use LLVM 10

Browse Source 
Fixes rust-lang/rust#74585
This commit is contained in:
Konrad Borowski 2020-07-22 18:03:31 +02:00 committed by Frederik Rietdijk
parent 26c6b14a4c
commit 41d681c85f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/rust/rustc.nix
View File

@ -1,6 +1,6 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
, fetchurl, file, python3 , fetchurl, file, python3
, llvm_9, darwin, cmake, rust, rustPlatform , llvm_10, darwin, cmake, rust, rustPlatform
, pkgconfig, openssl , pkgconfig, openssl
, which, libffi , which, libffi
, withBundledLLVM ? false , withBundledLLVM ? false
@ -14,12 +14,12 @@ let
inherit (stdenv.lib) optionals optional optionalString; inherit (stdenv.lib) optionals optional optionalString;
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
llvmSharedForBuild = pkgsBuildBuild.llvm_9.override { enableSharedLibraries = true; }; llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvm_9.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvm_10.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvm_9.override { enableSharedLibraries = true; }; llvmSharedForTarget = pkgsBuildTarget.llvm_10.override { enableSharedLibraries = true; };
# For use at runtime # For use at runtime
llvmShared = llvm_9.override { enableSharedLibraries = true; }; llvmShared = llvm_10.override { enableSharedLibraries = true; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "rustc"; pname = "rustc";
inherit version; inherit version;