[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: pack: Use guile-for-build for the target system.
From: |
Ludovic Courtès |
Subject: |
01/02: pack: Use guile-for-build for the target system. |
Date: |
Thu, 5 Jul 2018 11:19:30 -0400 (EDT) |
civodul pushed a commit to branch version-0.15.0
in repository guix.
commit 5adb2df0a2584d49f1fde7671c81ba54f7e43d51
Author: Ludovic Courtès <address@hidden>
Date: Thu Jul 5 13:35:21 2018 +0200
pack: Use guile-for-build for the target system.
Until now, running "guix pack -s i686-linux" on an x86_64-linux machine,
for instance, would use an x86_64 guile for module derivations. This
was OK until now, but would break when passing "--localstatedir" due to
the introduction of guile-sqlite3: we'd be using the i686 guile-sqlite3
along with the x86_64 guile.
* guix/scripts/pack.scm (guix-pack): Pass the 'system option from OPTS
to 'package-derivation'.
---
guix/scripts/pack.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 7f087a3..6d5d745 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -722,6 +722,7 @@ Create a bundle of PACKAGE.\n"))
(if (assoc-ref opts 'bootstrap?)
%bootstrap-guile
(canonical-package guile-2.2))
+ (assoc-ref opts 'system)
#:graft? (assoc-ref opts 'graft?))))
(let* ((dry-run? (assoc-ref opts 'dry-run?))
(relocatable? (assoc-ref opts 'relocatable?))