nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ld-wrapper: Allow linking with non-store libraries by default. 

This was suggested on several occasions, notably
<https://bugs.gnu.org/24544>.

* gnu/packages/ld-wrapper.in (%allow-impurities?): Default to #t and
parse the value of 'GUIX_LD_WRAPPER_ALLOW_IMPURITIES'.
* guix/build/gnu-build-system.scm (set-paths): Set
'GUIX_LD_WRAPPER_ALLOW_IMPURITIES'.
This commit is contained in:
Ludovic Courtès 2018-03-29 17:54:53 +02:00
parent 1a5e07c3b5
commit d0a2db47fb
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/ld-wrapper.in
View File

@ -81,7 +81,19 @@ exec @GUILE@ -c "(load-compiled \"@SELF@.go\") (apply $main (cdr (command-line))
(define %allow-impurities? (define %allow-impurities?
;; Whether to allow references to libraries outside the store. ;; Whether to allow references to libraries outside the store.
(getenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES")) ;; Allow them by default for convenience.
(let ((value (getenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES")))
(or (not value)
(let ((value (string-downcase value)))
(cond ((member value '("yes" "y" "t" "true" "1"))
#t)
((member value '("no" "n" "f" "false" "0"))
#f)
(else
(format (current-error-port)
"ld-wrapper: ~s: invalid value for \
'GUIX_LD_WRAPPER_ALLOW_IMPURITIES'~%"
value)))))))
(define %debug? (define %debug?
;; Whether to emit debugging output. ;; Whether to emit debugging output.

3
guix/build/gnu-build-system.scm
View File

@ -87,6 +87,9 @@ See https://reproducible-builds.org/specs/source-date-epoch/."
(#f ; not cross compiling (#f ; not cross compiling
'()))) '())))
;; Tell 'ld-wrapper' to disallow non-store libraries.
(setenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES" "no")
;; When cross building, $PATH must refer only to native (host) inputs since ;; When cross building, $PATH must refer only to native (host) inputs since
;; target inputs are not executable. ;; target inputs are not executable.
(set-path-environment-variable "PATH" '("bin" "sbin") (set-path-environment-variable "PATH" '("bin" "sbin")