03/07: gnu: ld-wrapper: Add 'GUIX_LD_WRAPPER_DISABLE_RPATH' environment variable.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 71b671681472d64c1077c2014132af56ce49ce4e
Author: Ludovic Courtès <address@hidden>
Date:   Tue Apr 7 10:29:51 2015 +0200

    gnu: ld-wrapper: Add 'GUIX_LD_WRAPPER_DISABLE_RPATH' environment variable.
    
    * gnu/packages/ld-wrapper.scm (%disable-rpath?): New variable.
      (rpath-arguments): Honor it.
---
 gnu/packages/ld-wrapper.scm |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/gnu/packages/ld-wrapper.scm b/gnu/packages/ld-wrapper.scm
index cd2a2c4..094018d 100644
--- a/gnu/packages/ld-wrapper.scm
+++ b/gnu/packages/ld-wrapper.scm
@@ -82,6 +82,10 @@ exec @GUILE@ -c "(load-compiled \"@address@hidden") (apply 
$main (cdr (command-line))
   ;; Whether to emit debugging output.
   (getenv "GUIX_LD_WRAPPER_DEBUG"))
 
+(define %disable-rpath?
+  ;; Whether to disable automatic '-rpath' addition.
+  (getenv "GUIX_LD_WRAPPER_DISABLE_RPATH"))
+
 (define (readlink* file)
   ;; Call 'readlink' until the result is not a symlink.
   (define %max-symlink-depth 50)
@@ -176,7 +180,8 @@ exec @GUILE@ -c "(load-compiled \"@address@hidden") (apply 
$main (cdr (command-line))
                 ;; want to add '-rpath' for files under %BUILD-DIRECTORY or
                 ;; %TEMPORARY-DIRECTORY because that could leak to installed
                 ;; files.
-                (cond ((store-file-name? file)
+                (cond ((and (not %disable-rpath?)
+                            (store-file-name? file))
                        (cons* "-rpath" (dirname file) args))
                       ((or %allow-impurities?
                            (pure-file-name? file))