Skip to content
Snippets Groups Projects
Unverified Commit a59b0fa2 authored by Danny Milosavljevic's avatar Danny Milosavljevic
Browse files

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.
parent 57ac5261
No related branches found
No related tags found
No related merge requests found
...@@ -66,7 +66,7 @@ (define (run-setuphs command params) ...@@ -66,7 +66,7 @@ (define (run-setuphs command params)
(format #t "running \"runhaskell Setup.hs\" with command ~s \ (format #t "running \"runhaskell Setup.hs\" with command ~s \
and parameters ~s~%" and parameters ~s~%"
command params) 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")))) (error "no Setup.hs nor Setup.lhs found"))))
(define* (configure #:key outputs inputs tests? (configure-flags '()) (define* (configure #:key outputs inputs tests? (configure-flags '())
...@@ -114,7 +114,8 @@ (define* (configure #:key outputs inputs tests? (configure-flags '()) ...@@ -114,7 +114,8 @@ (define* (configure #:key outputs inputs tests? (configure-flags '())
(setenv "CONFIG_SHELL" "sh")) (setenv "CONFIG_SHELL" "sh"))
(run-setuphs "configure" params) (run-setuphs "configure" params)
(setenv "GHC_PACKAGE_PATH" ghc-path))) (setenv "GHC_PACKAGE_PATH" ghc-path)
#t))
(define* (build #:rest empty) (define* (build #:rest empty)
"Build a given Haskell package." "Build a given Haskell package."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment