summary refs log tree commit diff
path: root/pkgs/development/compilers/rust
diff options
context:
space:
mode:
authorAndrew Childs <lorne@cons.org.nz>2018-01-24 20:34:03 +0900
committerAndrew Childs <lorne@cons.org.nz>2018-01-26 09:41:24 +0900
commit7857399288e9c9e04569f777912789118b215a2a (patch)
tree6d29095cb9fc326d013b0aca3099a06c11be8ee3 /pkgs/development/compilers/rust
parentb0dd3a189dcc93d2f4b042fd0b773c810330506c (diff)
downloadnixlib-7857399288e9c9e04569f777912789118b215a2a.tar
nixlib-7857399288e9c9e04569f777912789118b215a2a.tar.gz
nixlib-7857399288e9c9e04569f777912789118b215a2a.tar.bz2
nixlib-7857399288e9c9e04569f777912789118b215a2a.tar.lz
nixlib-7857399288e9c9e04569f777912789118b215a2a.tar.xz
nixlib-7857399288e9c9e04569f777912789118b215a2a.tar.zst
nixlib-7857399288e9c9e04569f777912789118b215a2a.zip
rustc: Fix corrupted .rlib files caused by stripping on Darwin
Diffstat (limited to 'pkgs/development/compilers/rust')
-rw-r--r--pkgs/development/compilers/rust/rustc.nix6
1 files changed, 6 insertions, 0 deletions
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