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

gnu: guile-static-stripped: Use invoke instead of system*. 

* gnu/packages/make-bootstrap.scm (guile-static-stripped)[arguments]: Use
invoke and remove vestigial plumbing.
This commit is contained in:
Mark H Weaver 2018-03-16 06:34:22 -04:00
parent c2af3b0725
commit 1a83e2a286
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnu/packages/make-bootstrap.scm
View File

@ -590,21 +590,22 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(mkdir (string-append out "/bin")) (mkdir (string-append out "/bin"))
(copy-file guile1 guile2) (copy-file guile1 guile2)
;; Does the relocated Guile work? ;; Verify that the relocated Guile works.
(and ,(if (%current-target-system) ,@(if (%current-target-system)
#t '()
'(zero? (system* guile2 "--version"))) '((invoke guile2 "--version")))
(begin
;; Strip store references.
(remove-store-references guile2)
;; Does the stripped Guile work? If it aborts, it could be ;; Strip store references.
;; that it tries to open iconv descriptors and fails because (remove-store-references guile2)
;; libc's iconv data isn't available (see
;; `guile-default-utf8.patch'.) ;; Verify that the stripped Guile works. If it aborts, it could be
,(if (%current-target-system) ;; that it tries to open iconv descriptors and fails because libc's
#t ;; iconv data isn't available (see `guile-default-utf8.patch'.)
'(zero? (system* guile2 "--version"))))))))) ,@(if (%current-target-system)
'()
'((invoke guile2 "--version")))
#t))))
(inputs `(("guile" ,%guile-static))) (inputs `(("guile" ,%guile-static)))
(outputs '("out")) (outputs '("out"))
(synopsis "Minimal statically-linked and relocatable Guile"))) (synopsis "Minimal statically-linked and relocatable Guile")))