diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-07-24 19:56:35 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-07-24 19:56:35 +0200 |
commit | 706ae8e15c8d36b0aee7c19c54c143d3e17f5784 (patch) | |
tree | e9fe8ebfb1417d30979b5413165599f066a1c504 /guix/build/meson-build-system.scm | |
parent | 3e95125e9bd0676d4a9add9105217ad3eaef3ff0 (diff) | |
parent | 8440db459a10daa24282038f35bc0b6771bd51ab (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build/meson-build-system.scm')
-rw-r--r-- | guix/build/meson-build-system.scm | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index 6dac007a6d..9724764424 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -59,17 +59,14 @@ (mkdir build-dir) (chdir build-dir) - (apply invoke "meson" args) - #t)) + (apply invoke "meson" args))) (define* (build #:key parallel-build? #:allow-other-keys) "Build a given meson package." - (apply invoke "ninja" - (if parallel-build? - `("-j" ,(number->string (parallel-job-count))) - '("-j" "1"))) - #t) + (invoke "ninja" "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1"))) (define* (check #:key test-target parallel-tests? tests? #:allow-other-keys) @@ -83,8 +80,7 @@ #t) (define* (install #:rest args) - (invoke "ninja" "install") - #t) + (invoke "ninja" "install")) (define* (fix-runpath #:key (elf-directories '("lib" "lib64" "libexec" "bin" "sbin")) |