ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-28 22:11:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guix: Do not copy bootstrap-guile when cross-compiling.

Browse source 
* gnu/packages/package-management.scm (guix)[arguments]: When cross-compiling,
skip copy-bootstrap-guile phase; needed for tests only.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-04-24 08:54:43 +02:00 committed by Jan Nieuwenhuizen
parent f589cbc4dc
commit d653e184ec
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 37 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/package-management.scm
View file

@ -181,9 +181,11 @@ (define-public guix
(invoke "sh" "bootstrap"))) (invoke "sh" "bootstrap")))
(add-before 'check 'copy-bootstrap-guile (add-before 'check 'copy-bootstrap-guile
(lambda* (#:key system inputs #:allow-other-keys) (lambda* (#:key system target inputs #:allow-other-keys)
;; Copy the bootstrap guile tarball in the store used (unless target
;; by the test suite. (begin
;; Copy the bootstrap guile tarball in the store
;; used by the test suite.
(define (intern file recursive?) (define (intern file recursive?)
;; Note: don't use 'guix download' here because we ;; Note: don't use 'guix download' here because we
;; need to set the 'recursive?' argument. ;; need to set the 'recursive?' argument.
@ -220,7 +222,7 @@ (define code
(for-each (lambda (input) (for-each (lambda (input)
(intern (assoc-ref inputs input) #t)) (intern (assoc-ref inputs input) #t))
'("bootstrap/bash" "bootstrap/mkdir" '("bootstrap/bash" "bootstrap/mkdir"
"bootstrap/tar" "bootstrap/xz")) "bootstrap/tar" "bootstrap/xz"))))
#t)) #t))
(add-after 'unpack 'disable-failing-tests (add-after 'unpack 'disable-failing-tests
;; XXX FIXME: These tests fail within the build container. ;; XXX FIXME: These tests fail within the build container.