diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-10-13 23:04:06 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-13 23:04:06 +0200 |
| commit | 378ebc048c033744b4f1dc13e16f4f2277d7529f (patch) | |
| tree | 8411f2a9348d47858b2aca849377e91ea7f90833 /guix/build | |
| parent | d99e7ee0f2bbe4abe08552afaa9821036da2a760 (diff) | |
| parent | 64855281c18bab87a61c77a18c9001e6e222fb08 (diff) | |
| download | gnu-guix-378ebc048c033744b4f1dc13e16f4f2277d7529f.tar gnu-guix-378ebc048c033744b4f1dc13e16f4f2277d7529f.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/scons-build-system.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/guix/build/scons-build-system.scm b/guix/build/scons-build-system.scm index eb013f03b6..17a0b7b877 100644 --- a/guix/build/scons-build-system.scm +++ b/guix/build/scons-build-system.scm @@ -29,7 +29,7 @@ ;; ;; Code: -(define* (build #:key outputs (scons-flags '()) (parallel-build? #t) #:allow-other-keys) +(define* (build #:key outputs (build-targets '()) (scons-flags '()) (parallel-build? #t) #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (mkdir-p out) (apply invoke "scons" @@ -37,7 +37,8 @@ (list "-j" (number->string (parallel-job-count))) (list)) - scons-flags)))) + scons-flags + build-targets)))) (define* (check #:key tests? test-target (scons-flags '()) #:allow-other-keys) "Run the test suite of a given SCons application." @@ -46,9 +47,9 @@ (format #t "test suite not run~%")) #t) -(define* (install #:key outputs (scons-flags '()) #:allow-other-keys) +(define* (install #:key outputs (install-targets '("install")) (scons-flags '()) #:allow-other-keys) "Install a given SCons application." - (apply invoke "scons" "install" scons-flags)) + (apply invoke "scons" (append scons-flags install-targets))) (define %standard-phases (modify-phases gnu:%standard-phases |