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

bootstrap: static-bash-for-glibc: Consider %current-system at run time. 

* gnu/packages/commencement.scm (static-bash-for-glibc): Rewrite so
that (%boot1-inputs) is evaluated run time, rather than at load time.
This commit is contained in:
Jan Nieuwenhuizen 2018-09-18 22:25:27 +02:00
parent f50b013f8c
commit 517af02ea1
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/commencement.scm
View File

@ -630,10 +630,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define static-bash-for-glibc (define static-bash-for-glibc
;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co.
(let* ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0 (let ((bash (package
glibc-final-with-bootstrap-bash
(car (assoc-ref (%boot1-inputs) "bash"))))
(bash (package
(inherit static-bash) (inherit static-bash)
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments
@ -647,14 +644,19 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(list (string-append "LDFLAGS=-static -L" (list (string-append "LDFLAGS=-static -L"
(assoc-ref %build-inputs (assoc-ref %build-inputs
"libc:static") "libc:static")
"/lib")))))))) "/lib")))))))))
(inputs `(("gcc" ,gcc) (package-with-bootstrap-guile
(package-with-explicit-inputs
bash
(lambda _
(let ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0
glibc-final-with-bootstrap-bash
(car (assoc-ref (%boot1-inputs) "bash")))))
`(("gcc" ,gcc)
("libc" ,glibc-final-with-bootstrap-bash) ("libc" ,glibc-final-with-bootstrap-bash)
("libc:static" ,glibc-final-with-bootstrap-bash "static") ("libc:static" ,glibc-final-with-bootstrap-bash "static")
,@(fold alist-delete (%boot1-inputs) ,@(fold alist-delete (%boot1-inputs)
'("gcc" "libc"))))) '("gcc" "libc")))))
(package-with-bootstrap-guile
(package-with-explicit-inputs bash (lambda _ inputs)
(current-source-location) (current-source-location)
#:guile %bootstrap-guile)))) #:guile %bootstrap-guile))))