summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-09-25 12:10:27 +0200
committerGitHub <noreply@github.com>2018-09-25 12:10:27 +0200
commit6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf (patch)
tree367d2e89055bd2ee49010b46ac778e6f14b0d690 /pkgs/stdenv
parent867d387a1c92dee533f380e5aeca874b3507de4f (diff)
parent4d9f9f171b776ede7765aabb4cd4ae588f9fbf68 (diff)
downloadnixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.tar
nixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.tar.gz
nixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.tar.bz2
nixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.tar.lz
nixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.tar.xz
nixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.tar.zst
nixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.zip
Merge pull request #47245 from dtzWill/fix/coreutils-8.30-bootstrap
coreutils: try 8.30 again, fix bootstrap tools expression motivating revert before
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 4fc9999b538c..59ded9d81108 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -112,8 +112,8 @@ in with pkgs; rec {
         cp -d ${gcc.cc.out}/bin/gcc $out/bin
         cp -d ${gcc.cc.out}/bin/cpp $out/bin
         cp -d ${gcc.cc.out}/bin/g++ $out/bin
-        cp -d ${gcc.cc.lib}/lib*/libgcc_s.so* $out/lib
-        cp -d ${gcc.cc.lib}/lib*/libstdc++.so* $out/lib
+        cp -d ${gcc.cc.lib}/lib/libgcc_s.so* $out/lib
+        cp -d ${gcc.cc.lib}/lib/libstdc++.so* $out/lib
         cp -rd ${gcc.cc.out}/lib/gcc $out/lib
         chmod -R u+w $out/lib
         rm -f $out/lib/gcc/*/*/include*/linux