about summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2017-02-04 23:38:48 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2017-02-04 23:39:25 +0200
commitb2343099ab9667108b8dca9d1b3efc056b6ceb4e (patch)
treea9b9f440236cab47053d2aa3b0638f423cd0becf /pkgs/stdenv
parent01d03cb5e7faaf8d6e44f4c12d81fe45f92e364f (diff)
downloadnixlib-b2343099ab9667108b8dca9d1b3efc056b6ceb4e.tar
nixlib-b2343099ab9667108b8dca9d1b3efc056b6ceb4e.tar.gz
nixlib-b2343099ab9667108b8dca9d1b3efc056b6ceb4e.tar.bz2
nixlib-b2343099ab9667108b8dca9d1b3efc056b6ceb4e.tar.lz
nixlib-b2343099ab9667108b8dca9d1b3efc056b6ceb4e.tar.xz
nixlib-b2343099ab9667108b8dca9d1b3efc056b6ceb4e.tar.zst
nixlib-b2343099ab9667108b8dca9d1b3efc056b6ceb4e.zip
make-bootstrap-tools{,-cross}.nix: Fix build after binutils changes
Broken after commit 17a344a ("binutils: Add lib output").
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools-cross.nix2
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index dda1f7e0b337..1a762bd87c79 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -229,7 +229,7 @@ rec {
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils.out}/bin/$i $out/bin
         done
-        cp -d ${binutils.out}/lib/lib*.so* $out/lib
+        cp -d ${binutils.lib}/lib/lib*.so* $out/lib
 
         chmod -R u+w $out
 
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 2e7b24af131d..42015a79a3e0 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -126,7 +126,7 @@ rec {
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils.out}/bin/$i $out/bin
         done
-        cp -d ${binutils.out}/lib/lib*.so* $out/lib
+        cp -d ${binutils.lib}/lib/lib*.so* $out/lib
 
         chmod -R u+w $out