gnu: make-gcc-toolchain: Improve style.

* gnu/packages/commencement.scm (make-gcc-toolchain)[arguments]:
Improve style, use G-expressions.

Change-Id: Ib030b50f4c184d4762ced12e450d643cb016690f
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Merges: #7406

1 files changed, 19 insertions, 21 deletions

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 8e80c1f3d24..087d26670a0 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3660,27 +3660,25 @@ COREUTILS-FINAL vs. COREUTILS, etc."
       (source #f)
       (build-system trivial-build-system)
       (arguments
-       '(#:modules ((guix build union))
-         #:builder (begin
-                     (use-modules (ice-9 match)
-                                  (srfi srfi-1)
-                                  (srfi srfi-26)
-                                  (guix build union))
-
-                     (let ((out (assoc-ref %outputs "out")))
-                       (union-build out
-                                    (filter-map (match-lambda
-                                                  (("libc-debug" . _) #f)
-                                                  (("libc-static" . _) #f)
-                                                  ((_ . directory) directory))
-                                                %build-inputs))
-
-                       (union-build (assoc-ref %outputs "debug")
-                                    (list (assoc-ref %build-inputs
-                                                     "libc-debug")))
-                       (union-build (assoc-ref %outputs "static")
-                                    (list (assoc-ref %build-inputs
-                                                     "libc-static")))))))
+       (list
+        #:modules '((guix build union))
+        #:builder
+        #~(begin
+            (use-modules (ice-9 match)
+                         (srfi srfi-1)
+                         (srfi srfi-26)
+                         (guix build union))
+
+            (union-build #$output
+                         (filter-map (match-lambda
+                                       (("libc-debug" . _) #f)
+                                       (("libc-static" . _) #f)
+                                       ((_ . directory) directory))
+                                     %build-inputs))
+            (union-build #$output:debug
+                         (list (assoc-ref %build-inputs "libc-debug")))
+            (union-build #$output:static
+                         (list (assoc-ref %build-inputs "libc-static"))))))
 
       (native-search-paths
        (append (package-native-search-paths gcc)