futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build-system/haskell: Support parallel builds.

Browse Source 
* guix/build-system/haskell.scm (haskell-build): Add keyword PARALLEL-BUILD?
and pass it on to the builder.
* guix/build/haskell-build-system.scm (build): Accept keyword PARALLEL-BUILD?
and pass the number of parallel jobs to GHC.
This commit is contained in:
Ricardo Wurmus 2020-06-16 22:25:48 +02:00
parent 54c9b5bfd7
commit 67cb9fa235
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix/build-system/haskell.scm
View File

@ -105,6 +105,7 @@ version REVISION."
(haddock-flags ''()) (haddock-flags ''())
(tests? #t) (tests? #t)
(test-target "test") (test-target "test")
(parallel-build? #t)
(configure-flags ''()) (configure-flags ''())
(phases '(@ (guix build haskell-build-system) (phases '(@ (guix build haskell-build-system)
%standard-phases)) %standard-phases))
@ -138,6 +139,7 @@ provides a 'Setup.hs' file as its build system."
#:system ,system #:system ,system
#:test-target ,test-target #:test-target ,test-target
#:tests? ,tests? #:tests? ,tests?
#:parallel-build? ,parallel-build?
#:haddock? ,haddock? #:haddock? ,haddock?
#:phases ,phases #:phases ,phases
#:outputs %outputs #:outputs %outputs

7
guix/build/haskell-build-system.scm
View File

@ -121,9 +121,12 @@ and parameters ~s~%"
(setenv "GHC_PACKAGE_PATH" ghc-path) (setenv "GHC_PACKAGE_PATH" ghc-path)
#t)) #t))
(define* (build #:rest empty) (define* (build #:key parallel-build? #:allow-other-keys)
"Build a given Haskell package." "Build a given Haskell package."
(run-setuphs "build" '())) (run-setuphs "build"
(if parallel-build?
`(,(string-append "--ghc-option=-j" (number->string (parallel-job-count))))
'())))
(define* (install #:rest empty) (define* (install #:rest empty)
"Install a given Haskell package." "Install a given Haskell package."