[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/42: gnu: guix: Do not copy bootstrap-guile when cross-compiling.
From: |
guix-commits |
Subject: |
02/42: gnu: guix: Do not copy bootstrap-guile when cross-compiling. |
Date: |
Sat, 25 Apr 2020 13:45:00 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 2ea183f7bae6a4efbe1976a7e6e29b8ce1917f29
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
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 _
- branch wip-hurd-vm created (now e460289), guix-commits, 2020/04/25
- 03/42: gnu: guix: Indent `copy-bootstrap-guile' code., guix-commits, 2020/04/25
- 01/42: gnu: guix: Apply courage for the Hurd., guix-commits, 2020/04/25
- 02/42: gnu: guix: Do not copy bootstrap-guile when cross-compiling.,
guix-commits <=
- 06/42: gnu: guix: Use gnutls-3.6.13 when cross-compiling., guix-commits, 2020/04/25
- 05/42: gnu: guix: Cross-build fixup for wrap-program., guix-commits, 2020/04/25
- 08/42: gnu: guix: Update to eeb87326d8., guix-commits, 2020/04/25
- 04/42: gnu: guix: Cross-build workaround: Run native guile for version., guix-commits, 2020/04/25
- 09/42: vm: Make the device node procedure a parameter., guix-commits, 2020/04/25
- 13/42: gnu: Add dde-sources., guix-commits, 2020/04/25
- 10/42: gnu: hurd: Build DDE libraries., guix-commits, 2020/04/25
- 14/42: gnu: Add netdde., guix-commits, 2020/04/25
- 17/42: system: hurd: Add less, which to %base-packages/hurd., guix-commits, 2020/04/25
- 18/42: system: hurd: Add /etc/group., guix-commits, 2020/04/25