diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-02-28 22:40:06 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-03-30 22:48:44 +0200 |
commit | 6cd591155c10aa3cbc33d9e219dee9d948fda54e (patch) | |
tree | 2c990c4d90480a826a8acf96b44eca4ae68a5405 /guix/build-system/cmake.scm | |
parent | f95fc73248e81a65e84798a344e0c781c1121f76 (diff) |
build-system: Use 'input-tuples->gexp' and 'outputs->gexp'.
* guix/gexp.scm (input-tuples->gexp, outputs->gexp): Make public.
* guix/build-system/cargo.scm (cargo-build): Use them.
* guix/build-system/gnu.scm (gnu-cross-build): Likewise.
* guix/build-system/ocaml.scm (ocaml-build): Likewise.
* guix/build-system/cmake.scm (cmake-cross-build): Likewise.
Diffstat (limited to 'guix/build-system/cmake.scm')
-rw-r--r-- | guix/build-system/cmake.scm | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 80059217c2..2f9689b07c 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -204,20 +204,14 @@ build system." (use-modules #$@(sexp->gexp modules)) (define %build-host-inputs - (map (lambda (tuple) - (apply cons tuple)) - '#+(append build-inputs target-inputs))) + #+(input-tuples->gexp build-inputs)) (define %build-target-inputs - (map (lambda (tuple) - (apply cons tuple)) - '#$host-inputs)) + (append #$(input-tuples->gexp host-inputs) + #+(input-tuples->gexp target-inputs))) (define %outputs - (list #$@(map (lambda (name) - #~(cons #$name - (ungexp output name))) - outputs))) + #$(outputs->gexp outputs)) (cmake-build #:source #+source #:system #$system |