From 7857399288e9c9e04569f777912789118b215a2a Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 24 Jan 2018 20:34:03 +0900 Subject: [PATCH] rustc: Fix corrupted .rlib files caused by stripping on Darwin --- pkgs/development/compilers/rust/rustc.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index b7808ab6ec0f..482f875054f8 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -37,6 +37,12 @@ stdenv.mkDerivation { # The build will fail at the very end on AArch64 without this. dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; + # Running the default `strip -S` command on Darwin corrupts the + # .rlib files in "lib/". + # + # See https://github.com/NixOS/nixpkgs/pull/34227 + stripDebugList = if stdenv.isDarwin then [ "bin" ] else null; + NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; # Enable nightly features in stable compiles (used for