guix-commits
[Top][All Lists]
Advanced

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

01/01: build-system/haskell: Make phases fail on error.


From: Danny Milosavljevic
Subject: 01/01: build-system/haskell: Make phases fail on error.
Date: Tue, 10 Jul 2018 20:46:32 -0400 (EDT)

dannym pushed a commit to branch master
in repository guix.

commit a59b0fa2d7af644482a015cebfe1487e3736c223
Author: Danny Milosavljevic <address@hidden>
Date:   Wed Jul 11 02:32:58 2018 +0200

    build-system/haskell: Make phases fail on error.
    
    * guix/build/haskell-build-system.scm (configure): Make it fail on error.
    (run-setuphs): Make it fail on error.
---
 guix/build/haskell-build-system.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/build/haskell-build-system.scm 
b/guix/build/haskell-build-system.scm
index 268d59c..26519ce 100644
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@ -66,7 +66,7 @@
           (format #t "running \"runhaskell Setup.hs\" with command ~s \
 and parameters ~s~%"
                   command params)
-          (zero? (apply system* "runhaskell" setup-file command params)))
+          (apply invoke "runhaskell" setup-file command params))
         (error "no Setup.hs nor Setup.lhs found"))))
 
 (define* (configure #:key outputs inputs tests? (configure-flags '())
@@ -114,7 +114,8 @@ and parameters ~s~%"
       (setenv "CONFIG_SHELL" "sh"))
     (run-setuphs "configure" params)
 
-    (setenv "GHC_PACKAGE_PATH" ghc-path)))
+    (setenv "GHC_PACKAGE_PATH" ghc-path)
+    #t))
 
 (define* (build #:rest empty)
   "Build a given Haskell package."



reply via email to

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