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.

1 files changed, 4 insertions, 10 deletions

diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 3fb1a241dd..a1b2b654aa 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -510,20 +510,14 @@ platform."
         (use-modules #$@(sexp->gexp modules))
 
         (define %build-host-inputs
-          (map (lambda (tuple)
-                 (apply cons tuple))
-               '#+build-inputs))
+          #+(input-tuples->gexp build-inputs))
 
         (define %build-target-inputs
-          (map (lambda (tuple)
-                 (apply cons tuple))
-               (append '#$host-inputs '#+target-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))
 
         (gnu-build #:source #+source
                    #:system #$system