From b8c7091335d77bfe72ce1c0d920b0bd816621fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 15:54:07 +0200
Subject: [PATCH] gcc: fixup references. ToDo: port to gcc-4.9

---
 pkgs/development/compilers/gcc/4.8/builder.sh  | 15 +++++++++++----
 pkgs/development/compilers/gcc/4.8/default.nix |  5 ++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/builder.sh b/pkgs/development/compilers/gcc/4.8/builder.sh
index 1c0a09accbf..a839f94bbd2 100644
--- a/pkgs/development/compilers/gcc/4.8/builder.sh
+++ b/pkgs/development/compilers/gcc/4.8/builder.sh
@@ -231,10 +231,17 @@ postInstall() {
     rm -rf $out/bin/gccbug
 
     # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
-    for i in $out/libexec/gcc/*/*/*; do
-        if PREV_RPATH=`patchelf --print-rpath $i`; then
-            patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i
-        fi
+    for i in "$out"/libexec/gcc/*/*/*; do
+        PREV_RPATH=`patchelf --print-rpath "$i"`
+        NEW_RPATH=`echo "$PREV_RPATH" | sed 's,:[^:]*bootstrap-tools/lib,,g'`
+        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
 
     # Get rid of some "fixed" header files
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 91f60726666..bd69476aa59 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -214,10 +214,9 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  outputs = [ "out" "lib" ];
-
+  outputs = [ "out" "lib" "doc" ];
   setOutputFlags = false;
-
+  NIX_NO_SELF_RPATH = true;
 
   libc_dev = stdenv.gcc.libc_dev;