branch wip-hurd-vm updated: squash! gnu: guix: Fix cross-compilation.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

The following commit(s) were added to refs/heads/wip-hurd-vm by this push:
     new d3631e7  squash! gnu: guix: Fix cross-compilation.
d3631e7 is described below

commit d3631e705f5c235a027534ef82f5ef0fc4ebe477
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Tue Apr 7 16:33:23 2020 +0200

    squash! gnu: guix: Fix cross-compilation.
---
 gnu/packages/package-management.scm | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index aedd387..9a7ca0d 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -134,14 +134,7 @@
                 (file-name (string-append "guix-" version "-checkout"))))
       (build-system gnu-build-system)
       (arguments
-       `(;; TODO: simplify upon rebuild
-         ,@(if (or (not (%current-target-system))
-                   (and (not (%current-target-system))
-                        (string=? (%current-system)
-                                  "x86_64-linux")))
-               '()
-               '(#:tests? #f))
-         #:configure-flags (list
+       `(#:configure-flags (list
                             "--localstatedir=/var"
                             "--sysconfdir=/etc"
                             (string-append "--with-bash-completion-dir="
@@ -193,11 +186,11 @@ $(prefix)/etc/init.d\n")))
                           ;; Use guix-for-build to generate manual pages.
                           `((add-before 'build 'cross-generate-manual-pages
                               (lambda _
-                                (let ((guix (assoc-ref %build-inputs "guix")))
+                                (let ((self (assoc-ref %build-inputs "self")))
                                   (substitute* "Makefile"
                                     (("LANGUAGE= 
[$][(]top_builddir[)]/pre-inst-env")
                                      (string-append "LANGUAGE= PATH="
-                                                    guix "/bin"
+                                                    self "/bin"
                                                     ":" (getenv "PATH"))))
                                   #t))))
                           '())
@@ -323,7 +316,12 @@ $(prefix)/etc/init.d\n")))
                        ("guile-sqlite3" ,guile-sqlite3)
                        ("guile-ssh" ,guile-ssh)
                        ("guile-git" ,guile-git)
-                       ,@(if (%current-target-system) `(("guix" ,guix)) '())
+                       ;; When cross-compiling, Guix needs a native version of
+                       ;; itself to generate the manual pages (see the related
+                       ;; phase above).
+                       ,@(if (%current-target-system)
+                             `(("self" ,this-package))
+                             '())
 
                        ;; XXX: Keep the development inputs here even though
                        ;; they're unnecessary, just so that 'guix environment