summary refs log tree commit diff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2018-07-11 02:32:58 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2018-07-11 02:45:53 +0200
commita59b0fa2d7af644482a015cebfe1487e3736c223 (patch)
tree45d1a7b7156d509dcc29f531650814f98695fa60
parent57ac5261fec345b16cf80f87aa03212abc2c5a11 (diff)
downloadguix-a59b0fa2d7af644482a015cebfe1487e3736c223.tar.gz
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.
-rw-r--r--guix/build/haskell-build-system.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm
index 268d59c1be..26519ce5a6 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."