about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-11-01 11:14:34 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-11-13 08:46:15 -0500
commitff023c9bc62e8ae663e617b7fc1ba9e3a9dc316a (patch)
treeeb06fbd517662696631b435e82eb781e225df488
parentf8741c38cd546e3ff18ce9d708de14ff2aae68ab (diff)
downloadnixlib-ff023c9bc62e8ae663e617b7fc1ba9e3a9dc316a.tar
nixlib-ff023c9bc62e8ae663e617b7fc1ba9e3a9dc316a.tar.gz
nixlib-ff023c9bc62e8ae663e617b7fc1ba9e3a9dc316a.tar.bz2
nixlib-ff023c9bc62e8ae663e617b7fc1ba9e3a9dc316a.tar.lz
nixlib-ff023c9bc62e8ae663e617b7fc1ba9e3a9dc316a.tar.xz
nixlib-ff023c9bc62e8ae663e617b7fc1ba9e3a9dc316a.tar.zst
nixlib-ff023c9bc62e8ae663e617b7fc1ba9e3a9dc316a.zip
treewide: Remove references to removed binutils outputs
-rw-r--r--pkgs/stdenv/darwin/default.nix2
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools-cross.nix1
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools.nix1
3 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index a67ca53e1c54..c1c9127636f1 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -353,7 +353,7 @@ in rec {
       bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
       gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
       gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
-      binutils-raw.dev binutils gettext
+      binutils gettext
       cc.expand-response-params
     ]) ++ (with pkgs.darwin; [
       dyld Libsystem CF cctools ICU libiconv locale
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 90c9d2cef67f..8a1f7445b30b 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -179,7 +179,6 @@ rec {
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils.out}/bin/$i $out/bin
         done
-        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 008daf8d5224..8f5272cc96a9 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -128,7 +128,6 @@ rec {
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils.out}/bin/$i $out/bin
         done
-        cp -d ${binutils.lib}/lib/lib*.so* $out/lib
 
         chmod -R u+w $out