me/guix
Archived
1
0
Fork 0
Code Activity

gnu: commencement: Memoize uses of 'cross-gcc-wrapper'.

Browse source 
This improves caching down the road.

* gnu/packages/commencement.scm (gcc-boot0-intermediate-wrapped)
(gcc-boot0-wrapped): Use 'mlambda' instead of 'lambda'.
This commit is contained in:
Ludovic Courtès 2019-11-03 18:00:54 +01:00
parent 7e1a74da93
commit 32793c09ff
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/commencement.scm
View file

@ -2070,12 +2070,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
("bash" ,bash))) ("bash" ,bash)))
(inputs '()))) (inputs '())))
(define (gcc-boot0-intermediate-wrapped) (define gcc-boot0-intermediate-wrapped
;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the (mlambda ()
;; non-cross names. ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the
(cross-gcc-wrapper gcc-boot0 binutils-boot0 ;; non-cross names.
glibc-final-with-bootstrap-bash (cross-gcc-wrapper gcc-boot0 binutils-boot0
(car (assoc-ref (%boot1-inputs) "bash")))) glibc-final-with-bootstrap-bash
(car (assoc-ref (%boot1-inputs) "bash")))))
(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.
@ -2166,11 +2167,12 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
,@(package-arguments glibc-final-with-bootstrap-bash))))) ,@(package-arguments glibc-final-with-bootstrap-bash)))))
(define (gcc-boot0-wrapped) (define gcc-boot0-wrapped
;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the (mlambda ()
;; non-cross names. ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the
(cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final ;; non-cross names.
(car (assoc-ref (%boot1-inputs) "bash")))) (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final
(car (assoc-ref (%boot1-inputs) "bash")))))
(define (%boot2-inputs) (define (%boot2-inputs)
;; 3rd stage inputs. ;; 3rd stage inputs.