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

treewide: Mass replace 'binutils}/bin' to refer to the correct outputs

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2016-04-10 22:50:27 +03:00
committed by Tuomas Tynkkynen
parent f34655e28c
commit 794f07d4e4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/rustc/generic.nix
View File

@@ -123,7 +123,7 @@ with stdenv.lib; stdenv.mkDerivation {
configureFlags = configureFlags
++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ]
# ++ [ "--jemalloc-root=${jemalloc}/lib"
++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils}/bin/ar" ]
++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
++ optional (stdenv.cc.cc ? isClang) "--enable-clang"
++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";