summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-06-25 18:53:49 -0400
committerMark H Weaver <mhw@netris.org>2018-06-28 03:55:34 -0400
commit0e6cce2e01c1ff89e373cc77578853de11a7e8eb (patch)
treef6ad7e19573db4bc9091bc695fd3f837ecc2fb89
parentb6dc384a5a2eaf1eb2de20ca06bd14860d2638b6 (diff)
downloadpatches-0e6cce2e01c1ff89e373cc77578853de11a7e8eb.tar
patches-0e6cce2e01c1ff89e373cc77578853de11a7e8eb.tar.gz
meson-build-system: Return #t from all phases.
* guix/build/meson-build-system.scm (configure, build, check, install): (fix-runpath): Use 'invoke' and return #t from all phases.
-rw-r--r--guix/build/meson-build-system.scm15
1 files changed, 7 insertions, 8 deletions
diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm
index e7690a4c37..e4aae8212f 100644
--- a/guix/build/meson-build-system.scm
+++ b/guix/build/meson-build-system.scm
@@ -58,15 +58,14 @@
(mkdir build-dir)
(chdir build-dir)
- (zero? (apply system* "meson" args))))
+ (apply invoke "meson" args)))
(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")))))
+ (invoke "ninja" "-j" (if parallel-build?
+ (number->string (parallel-job-count))
+ "1")))
(define* (check #:key test-target parallel-tests? tests?
#:allow-other-keys)
@@ -75,13 +74,13 @@
(number->string (parallel-job-count))
"1"))
(if tests?
- (zero? (system* "ninja" test-target))
+ (invoke "ninja" test-target)
(begin
(format #t "test suite not run~%")
#t)))
(define* (install #:rest args)
- (zero? (system* "ninja" "install")))
+ (invoke "ninja" "install"))
(define* (fix-runpath #:key (elf-directories '("lib" "lib64" "libexec"
"bin" "sbin"))
@@ -135,7 +134,7 @@ for example libraries only needed for the tests."
(find-files dir elf-pred))
existing-elf-dirs))))
(for-each (lambda (elf-file)
- (system* "patchelf" "--shrink-rpath" elf-file)
+ (invoke "patchelf" "--shrink-rpath" elf-file)
(handle-file elf-file elf-list))
elf-list)))))
(for-each handle-output outputs)