summary refs log tree commit diff
path: root/pkgs/stdenv/generic
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-06-27 11:15:28 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-08-09 12:44:49 +0200
commit83a41771abbfcfc027270671be55eb3ed1606a46 (patch)
tree88edc307d9adc91a0f6d91ddefec6a9044a5b173 /pkgs/stdenv/generic
parentb23dbb1a5dffbfa3abb47fcd0f1579ac2e6f29fc (diff)
downloadnixlib-83a41771abbfcfc027270671be55eb3ed1606a46.tar
nixlib-83a41771abbfcfc027270671be55eb3ed1606a46.tar.gz
nixlib-83a41771abbfcfc027270671be55eb3ed1606a46.tar.bz2
nixlib-83a41771abbfcfc027270671be55eb3ed1606a46.tar.lz
nixlib-83a41771abbfcfc027270671be55eb3ed1606a46.tar.xz
nixlib-83a41771abbfcfc027270671be55eb3ed1606a46.tar.zst
nixlib-83a41771abbfcfc027270671be55eb3ed1606a46.zip
Move RPATH shrinking from stdenv to a setup hook provided by patchelf
Diffstat (limited to 'pkgs/stdenv/generic')
-rw-r--r--pkgs/stdenv/generic/setup.sh17
1 files changed, 0 insertions, 17 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index d3d2d250e500..a953176127c7 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -702,19 +702,6 @@ checkPhase() {
 }
 
 
-patchELF() {
-    # Patch all ELF executables and shared libraries.
-    header "patching ELF executables and libraries"
-    if [ -e "$prefix" ]; then
-        find "$prefix" \( \
-            \( -type f -a -name "*.so*" \) -o \
-            \( -type f -a -perm +0100 \) \
-            \) -print -exec patchelf --shrink-rpath '{}' \;
-    fi
-    stopNest
-}
-
-
 patchShebangs() {
     # Rewrite all script interpreter file names (`#! /path') under the
     # specified  directory tree to paths found in $PATH.  E.g.,
@@ -886,10 +873,6 @@ _defaultFixupOutput() {
         fi
     fi
 
-    if [ "$havePatchELF" = 1 -a -z "$dontPatchELF" ]; then
-        patchELF "$prefix"
-    fi
-
     if [ -z "$dontPatchShebangs" ]; then
         patchShebangs "$prefix"
     fi