summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2023-01-03 10:28:49 +0000
committerSergei Trofimovich <slyich@gmail.com>2023-01-03 10:30:30 +0000
commit99b56a9139a6a125bc73afb8f3c30bba1a002148 (patch)
tree075728fdef77d9e6f28dd868e97e1d5e251ee63b
parent051d49badb03c9c6587a6e50f4fccb4d897c137f (diff)
downloadnixpkgs-99b56a9139a6a125bc73afb8f3c30bba1a002148.tar
nixpkgs-99b56a9139a6a125bc73afb8f3c30bba1a002148.tar.gz
nixpkgs-99b56a9139a6a125bc73afb8f3c30bba1a002148.tar.bz2
nixpkgs-99b56a9139a6a125bc73afb8f3c30bba1a002148.tar.lz
nixpkgs-99b56a9139a6a125bc73afb8f3c30bba1a002148.tar.xz
nixpkgs-99b56a9139a6a125bc73afb8f3c30bba1a002148.tar.zst
nixpkgs-99b56a9139a6a125bc73afb8f3c30bba1a002148.zip
gcc/builder.sh: drop dead RPATH clobbering code
The code was intended to use something like
    [ $buildConfig == *linux* ]
but never did and use always-false
    [ buildConfig == *linux* ]

As it's in nixpkgs for a few years let's just delete it instead of
restoring.
-rw-r--r--pkgs/development/compilers/gcc/builder.sh19
1 files changed, 0 insertions, 19 deletions
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index 113bd83ea53..2d7a058fa01 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -240,25 +240,6 @@ postInstall() {
     # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
     rm -rf $out/bin/gccbug
 
-    if [[ buildConfig == *"linux"* ]]; then
-        # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
-        for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); 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
-    fi
-
-    if [[ targetConfig == *"linux"* ]]; then
-        # For some reason, when building for linux on darwin, the libs retain
-        # RPATH to $out.
-        for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; 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
-    fi
-
     if type "install_name_tool"; then
         for i in "${!outputLib}"/lib/*.*.dylib "${!outputLib}"/lib/*.so.[0-9]; do
             install_name_tool -id "$i" "$i" || true