janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 2ea183f7bae6a4efbe1976a7e6e29b8ce1917f29
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
AuthorDate: Fri Apr 24 08:54:43 2020 +0200
gnu: guix: Do not copy bootstrap-guile when cross-compiling.
* gnu/packages/package-management.scm (guix)[arguments]: When
cross-compiling,
skip copy-bootstrap-guile phase; needed for tests only.
---
gnu/packages/package-management.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index a3a2b6d..02ddf1d 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -182,7 +182,9 @@
$(prefix)/etc/init.d\n")))
(invoke "sh" "bootstrap")))
- (add-before 'check 'copy-bootstrap-guile
+ ,@(if (%current-target-system)
+ '()
+ `((add-before 'check 'copy-bootstrap-guile
(lambda* (#:key system inputs #:allow-other-keys)
;; Copy the bootstrap guile tarball in the store used
;; by the test suite.
@@ -223,7 +225,7 @@ $(prefix)/etc/init.d\n")))
(intern (assoc-ref inputs input) #t))
'("bootstrap/bash" "bootstrap/mkdir"
"bootstrap/tar" "bootstrap/xz"))
- #t))
+ #t))))
(add-after 'unpack 'disable-failing-tests
;; XXX FIXME: These tests fail within the build
container.
(lambda _
