[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: meson-build-system: Return #t from all phases.

From: Mark H. Weaver
Subject: 01/02: meson-build-system: Return #t from all phases.
Date: Thu, 28 Jun 2018 03:58:50 -0400 (EDT)

mhw pushed a commit to branch staging
in repository guix.

commit 0e6cce2e01c1ff89e373cc77578853de11a7e8eb
Author: Mark H Weaver <address@hidden>
Date:   Mon Jun 25 18:53:49 2018 -0400

    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.
 guix/build/meson-build-system.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/guix/build/meson-build-system.scm 
index e7690a4..e4aae82 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?
   "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?
@@ -75,13 +74,13 @@
               (number->string (parallel-job-count))
   (if tests?
-      (zero? (system* "ninja" test-target))
+      (invoke "ninja" test-target)
         (format #t "test suite not run~%")
 (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))
          (for-each (lambda (elf-file)
-                     (system* "patchelf" "--shrink-rpath" elf-file)
+                     (invoke "patchelf" "--shrink-rpath" elf-file)
                      (handle-file elf-file elf-list))
   (for-each handle-output outputs)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]