From 71b671681472d64c1077c2014132af56ce49ce4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 7 Apr 2015 10:29:51 +0200 Subject: [PATCH] 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 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ld-wrapper.scm b/gnu/packages/ld-wrapper.scm index cd2a2c445e..094018de3d 100644 --- a/gnu/packages/ld-wrapper.scm +++ b/gnu/packages/ld-wrapper.scm @@ -82,6 +82,10 @@ (define %debug? ;; 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 @@ (define (rpath-arguments library-files) ;; 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))