summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-03-16 03:31:15 -0400
committerMark H Weaver <mhw@netris.org>2018-03-16 05:01:57 -0400
commit2eeffc0accf59f0173e5c3a32cf19812d912da73 (patch)
treea7b7a31afec2c75f61282bbd229575028534bc52
parent68ca0efa9aece04fab4cd631accd74f652fd1373 (diff)
downloadguix-2eeffc0accf59f0173e5c3a32cf19812d912da73.tar.gz
build-system/scons: Use invoke instead of system*.
* guix/build/scons-build-system.scm (build, check, install): Use invoke.
-rw-r--r--guix/build/scons-build-system.scm24
1 files changed, 12 insertions, 12 deletions
diff --git a/guix/build/scons-build-system.scm b/guix/build/scons-build-system.scm
index 96c653966d..eb013f03b6 100644
--- a/guix/build/scons-build-system.scm
+++ b/guix/build/scons-build-system.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,24 +32,23 @@
 (define* (build #:key outputs (scons-flags '()) (parallel-build? #t) #:allow-other-keys)
   (let ((out (assoc-ref outputs "out")))
     (mkdir-p out)
-    (zero? (apply system* "scons"
-                  (append (if parallel-build?
-                              (list "-j" (number->string
-                                          (parallel-job-count)))
-                              (list))
-                          scons-flags)))))
+    (apply invoke "scons"
+           (append (if parallel-build?
+                       (list "-j" (number->string
+                                   (parallel-job-count)))
+                       (list))
+                   scons-flags))))
 
 (define* (check #:key tests? test-target (scons-flags '()) #:allow-other-keys)
   "Run the test suite of a given SCons application."
-  (cond (tests?
-         (zero? (apply system* "scons" test-target scons-flags)))
-        (else
-         (format #t "test suite not run~%")
-         #t)))
+  (if tests?
+      (apply invoke "scons" test-target scons-flags)
+      (format #t "test suite not run~%"))
+  #t)
 
 (define* (install #:key outputs (scons-flags '()) #:allow-other-keys)
   "Install a given SCons application."
-  (zero? (apply system* "scons" "install" scons-flags)))
+  (apply invoke "scons" "install" scons-flags))
 
 (define %standard-phases
   (modify-phases gnu:%standard-phases