Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
Revert "rustc: Provide compiler-rt sources"
Browse files Browse the repository at this point in the history
This reverts commit b7a8280. It's no
longer needed with Rust 1.38.
  • Loading branch information
edolstra committed Sep 26, 2019
1 parent 954220b commit adb15c3
Showing 1 changed file with 6 additions and 16 deletions.
22 changes: 6 additions & 16 deletions pkgs/development/compilers/rust/rustc.nix
@@ -1,6 +1,6 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
, fetchurl, file, python2, tzdata, ps
, llvmPackages_7, darwin, git, cmake, rustPlatform
, llvm_7, darwin, git, cmake, rustPlatform
, which, libffi, gdb
, withBundledLLVM ? false
}:
Expand All @@ -9,17 +9,13 @@ let
inherit (stdenv.lib) optional optionalString;
inherit (darwin.apple_sdk.frameworks) Security;

llvmPackages = llvmPackages_7;

llvmSharedForBuild = pkgsBuildBuild.llvmPackages.llvm.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvmPackages.llvm.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvmPackages.llvm.override { enableSharedLibraries = true; };
llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; };

# For use at runtime
llvmShared = llvmPackages.llvm.override { enableSharedLibraries = true; };
in

stdenv.mkDerivation rec {
llvmShared = llvm_7.override { enableSharedLibraries = true; };
in stdenv.mkDerivation rec {
pname = "rustc";
version = "1.37.0";

Expand All @@ -28,12 +24,6 @@ stdenv.mkDerivation rec {
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;

# rustc complains about modified source files otherwise
Expand Down

0 comments on commit adb15c3

Please sign in to comment.