02/30: gnu: hurd: Fix hurd-target?, add hurd-system?.

[guix-commits]

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

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

    gnu: hurd: Fix hurd-target?, add hurd-system?.
    
    * 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?.
    (hurd-system?): New exported variable.
---
 gnu/packages/hurd.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index c147bac..59d5c31 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.
 ;;;
@@ -34,8 +35,9 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages texinfo)
   #:use-module (guix git-download)
-  #:export (hurd-triplet?
-            hurd-target?))
+  #:export (hurd-system?
+            hurd-target?
+            hurd-triplet?))
 
 (define (hurd-triplet? triplet)
   (and (string-suffix? "-gnu" triplet)
@@ -45,7 +47,12 @@
   "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-system?)
+  "Return true if the current system is the Hurd."
+  (and=> (%current-system) hurd-triplet?))
 
 (define (hurd-source-url version)
   (string-append "mirror://gnu/hurd/hurd-"