From baa90ac80d510e7357340a52316c5f438e27f538 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 May 2017 15:49:04 +0200 Subject: [PATCH] gnu: mes: Don't fail when (%current-target-system) is #f. * gnu/packages/mes.scm (mes)[native-inputs]: Evaluate system before testing string equality. --- gnu/packages/mes.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 66b0654de..82213b02c 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -75,13 +75,13 @@ extensive examples, including parsers for the Javascript and C99 languages.") `(("nyacc" ,nyacc))) (native-inputs `(("guile" ,guile-2.2) - ,@(if (or (equal? (%current-system) "x86_64-linux") - (string-prefix? (%current-target-system) "x86_64-linux")) - ;; Use cross-compiler rather than #:system "i686-linux" to get - ;; MesCC 64 bit .go files installed ready for use with Guile. - `(("i686-linux-binutils" ,(cross-binutils triplet)) - ("i686-linux-gcc" ,(cross-gcc triplet))) - '()) + ,@(let ((system (or (%current-target-system) (%current-system)))) + (if (string-prefix? "x86_64-linux" system) + ;; Use cross-compiler rather than #:system "i686-linux" to get + ;; MesCC 64 bit .go files installed ready for use with Guile. + `(("i686-linux-binutils" ,(cross-binutils triplet)) + ("i686-linux-gcc" ,(cross-gcc triplet))) + '())) ("perl" ,perl))) ;build-aux/gitlog-to-changelog (arguments `(#:phases -- 2.13.0