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

Revert "rustc: Provide compiler-rt sources"

Browse Source 
This reverts commit b7a8280312. It's no
longer needed with Rust 1.38.
This commit is contained in:
Eelco Dolstra 2019-09-26 14:50:07 +02:00
parent 954220b341
commit adb15c3a63
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
, fetchurl, file, python2, tzdata, ps , fetchurl, file, python2, tzdata, ps
, llvmPackages_7, darwin, git, cmake, rustPlatform , llvm_7, darwin, git, cmake, rustPlatform
, which, libffi, gdb , which, libffi, gdb
, withBundledLLVM ? false , withBundledLLVM ? false
}: }:
@ -9,17 +9,13 @@ let
inherit (stdenv.lib) optional optionalString; inherit (stdenv.lib) optional optionalString;
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
llvmPackages = llvmPackages_7; llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; };
llvmSharedForBuild = pkgsBuildBuild.llvmPackages.llvm.override { enableSharedLibraries = true; }; llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvmPackages.llvm.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvmPackages.llvm.override { enableSharedLibraries = true; };
# For use at runtime # For use at runtime
llvmShared = llvmPackages.llvm.override { enableSharedLibraries = true; }; llvmShared = llvm_7.override { enableSharedLibraries = true; };
in in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "rustc"; pname = "rustc";
version = "1.37.0"; version = "1.37.0";
@ -28,12 +24,6 @@ stdenv.mkDerivation rec {
sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"; sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj";
}; };
# Provide the compiler-rt sources needed for profiling.
preConfigure = ''
mkdir src/llvm-project/compiler-rt
tar xf ${llvmPackages.compiler-rt.src} -C src/llvm-project/compiler-rt --strip-components=1
'';
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
# rustc complains about modified source files otherwise # rustc complains about modified source files otherwise