From 51a5bbb2ef07d9b84645bd2d69e32cce5aba3eb2 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Fri, 20 Mar 2026 10:49:33 +0100 Subject: [PATCH] gnu: make-gcc-toolchain: Improve style. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/commencement.scm (make-gcc-toolchain)[arguments]: Improve style, use G-expressions. Change-Id: Ib030b50f4c184d4762ced12e450d643cb016690f Signed-off-by: Ludovic Courtès Merges: #7406 --- gnu/packages/commencement.scm | 38 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8e80c1f3d2..087d26670a 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)) + (list + #: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"))))))) + (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)