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

gcc: fixup references. ToDo: port to gcc-4.9

This commit is contained in:
Vladimír Čunát 2014-08-30 15:54:07 +02:00
parent 38ba4eb693
commit b8c7091335
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/compilers/gcc/4.8/builder.sh
View File

@ -231,10 +231,17 @@ postInstall() {
rm -rf $out/bin/gccbug rm -rf $out/bin/gccbug
# Take out the bootstrap-tools from the rpath, as it's not needed at all having $out # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
for i in $out/libexec/gcc/*/*/*; do for i in "$out"/libexec/gcc/*/*/*; do
if PREV_RPATH=`patchelf --print-rpath $i`; then PREV_RPATH=`patchelf --print-rpath "$i"`
patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i NEW_RPATH=`echo "$PREV_RPATH" | sed 's,:[^:]*bootstrap-tools/lib,,g'`
fi patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK
done
# For some reason the libs retain RPATH to $out
for i in "$lib"/lib/{libtsan.so.0.0.0,libasan.so.0.0.0}; do
PREV_RPATH=`patchelf --print-rpath "$i"`
NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"`
patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK
done done
# Get rid of some "fixed" header files # Get rid of some "fixed" header files

5
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -214,10 +214,9 @@ stdenv.mkDerivation ({
inherit patches; inherit patches;
outputs = [ "out" "lib" ]; outputs = [ "out" "lib" "doc" ];
setOutputFlags = false; setOutputFlags = false;
NIX_NO_SELF_RPATH = true;
libc_dev = stdenv.gcc.libc_dev; libc_dev = stdenv.gcc.libc_dev;