diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-03 12:09:50 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-03 12:09:50 +0100 |
| commit | aa564c9ed01268e7e0b030942592bc3beb642eef (patch) | |
| tree | b9d3916b75ac019a49faf9c41d844ccc724b55bd /pkgs/stdenv/linux | |
| parent | c2a2c2ecd4055d4c47204e64c7e45d5f15060750 (diff) | |
| download | nixlib-aa564c9ed01268e7e0b030942592bc3beb642eef.tar nixlib-aa564c9ed01268e7e0b030942592bc3beb642eef.tar.gz nixlib-aa564c9ed01268e7e0b030942592bc3beb642eef.tar.bz2 nixlib-aa564c9ed01268e7e0b030942592bc3beb642eef.tar.lz nixlib-aa564c9ed01268e7e0b030942592bc3beb642eef.tar.xz nixlib-aa564c9ed01268e7e0b030942592bc3beb642eef.tar.zst nixlib-aa564c9ed01268e7e0b030942592bc3beb642eef.zip | |
make-bootstrap-tools: fix #13629: glibc problems
On x86_64-linux glibc started to use linker scripts more extensively.
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index ef651f643684..3c8948699726 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -51,7 +51,15 @@ rec { cp -d ${glibc}/lib/crt?.o $out/lib cp -rL ${glibc}/include $out - chmod -R u+w $out/include + chmod -R u+w "$out" + + # glibc can contain linker scripts: find them, copy their deps, + # and get rid of absolute paths (nuke-refs would make them useless) + local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib") + cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc}' | sort -u) + for f in $lScripts; do + substituteInPlace "$f" --replace '${glibc}/lib/' "" + done # Hopefully we won't need these. rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video |