summaryrefslogtreecommitdiff
path: root/guix/build
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2018-06-30 18:06:20 +0200
committerRicardo Wurmus <rekado@elephly.net>2018-06-30 18:06:20 +0200
commit302213b9be577bf6e120405ef4316520403fbee3 (patch)
treebcd8655df51ffbaed97f2c9d4334493feb62b956 /guix/build
parentf1728d43460e63b106dd446e70001d8e100eaf6d (diff)
downloadgnu-guix-302213b9be577bf6e120405ef4316520403fbee3.tar
gnu-guix-302213b9be577bf6e120405ef4316520403fbee3.tar.gz
build-system/meson: Use invoke.
* guix/build/meson-build-system.scm (configure, build, check, install): Use "invoke" and unconditionally return #t.
Diffstat (limited to 'guix/build')
-rw-r--r--guix/build/meson-build-system.scm23
1 files changed, 13 insertions, 10 deletions
diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm
index 7efd433d6c..6dac007a6d 100644
--- a/guix/build/meson-build-system.scm
+++ b/guix/build/meson-build-system.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
+;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -58,15 +59,17 @@
(mkdir build-dir)
(chdir build-dir)
- (zero? (apply system* "meson" args))))
+ (apply invoke "meson" args)
+ #t))
(define* (build #:key parallel-build?
#:allow-other-keys)
"Build a given meson package."
- (zero? (apply system* "ninja"
- (if parallel-build?
- `("-j" ,(number->string (parallel-job-count)))
- '("-j" "1")))))
+ (apply invoke "ninja"
+ (if parallel-build?
+ `("-j" ,(number->string (parallel-job-count)))
+ '("-j" "1")))
+ #t)
(define* (check #:key test-target parallel-tests? tests?
#:allow-other-keys)
@@ -75,13 +78,13 @@
(number->string (parallel-job-count))
"1"))
(if tests?
- (zero? (system* "ninja" test-target))
- (begin
- (format #t "test suite not run~%")
- #t)))
+ (invoke "ninja" test-target)
+ (format #t "test suite not run~%"))
+ #t)
(define* (install #:rest args)
- (zero? (system* "ninja" "install")))
+ (invoke "ninja" "install")
+ #t)
(define* (fix-runpath #:key (elf-directories '("lib" "lib64" "libexec"
"bin" "sbin"))