guix-commits
[Top][All Lists]
Advanced

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

05/33: gnu: hurd: Fix hurd-target?.


From: guix-commits
Subject: 05/33: gnu: hurd: Fix hurd-target?.
Date: Tue, 10 Mar 2020 03:58:44 -0400 (EDT)

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

commit cd5f9ba3b1130d8f54b1ef33106f25f29732e007
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Wed Mar 4 11:49:46 2020 -0500

    gnu: hurd: Fix hurd-target?.
    
    * gnu/packages/hurd.scm (hurd-target?): Bugfix; the arguments to
    string-suffix? to test (%current-system) were transposed, always resulting
    in #f.  Use hurd-triplet?.
---
 gnu/packages/hurd.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index c147bac..af59f22 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2018 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2020 Efraim Flashner <address@hidden>
 ;;; Copyright © 2020 Marius Bakke <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -45,7 +46,8 @@
   "Return true if the cross-compilation target or the current system is
 GNU/Hurd."
   (or (and=> (%current-target-system) hurd-triplet?)
-      (string-suffix? (%current-system) "-gnu")))
+      (and (not (%current-target-system))
+           (and=> (%current-system) hurd-triplet?))))
 
 (define (hurd-source-url version)
   (string-append "mirror://gnu/hurd/hurd-"



reply via email to

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