guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

30/36: gnu: hurd: Cross-build hack: Set target i586-pc-gnu if unset.


From: guix-commits
Subject: 30/36: gnu: hurd: Cross-build hack: Set target i586-pc-gnu if unset.
Date: Fri, 1 May 2020 11:54:03 -0400 (EDT)

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

commit a8c336335c541e758bab306375db72c54a9f0d7d
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Thu Apr 30 00:05:16 2020 +0200

    gnu: hurd: Cross-build hack: Set target i586-pc-gnu if unset.
    
    Running
    
        ./pre-inst-env guix system vm-image --target=i586-pc-gnu 
gnu/system/examples/bare-hurd.tmpl
    
    will try to build hurd for x86_64.
    
    * gnu/packages/hurd.scm (hurd)[arguments]: Set #:target "i586-pc-gnu" if
    unset.
---
 gnu/packages/hurd.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 12263a4..b82d12a 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -519,6 +519,12 @@ fsysopts / --writable\n"))
                (substitute* file
                  (("@HURD@") out))
                #t))))
+       ;; XXX guix system vm-image --target=i586-pc-gnu has
+       ;; (%current-target-system) #f
+       ,@(if (and (not (%current-target-system))
+                  (not (hurd-system?)))
+             '(#:target "i586-pc-gnu")
+             '())
        #:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
                                               %output "/lib")
                           "--disable-ncursesw"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]