guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit a2549cafe40ad4cfb8a0044e22bc15b623b5a330 Author: Nicolas Graves <[email protected]> AuthorDate: Fri Mar 20 10:49:33 2026 +0100 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 <[email protected]> Signed-off-by: Zheng Junjie <[email protected]> Merges: #7406 --- gnu/packages/commencement.scm | 53 ++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index bcd1b94357e..264951cd880 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3689,34 +3689,31 @@ 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)) - - ;; Create 'cc' so that one can use it as a drop-in - ;; replacement for the default tool chain and have - ;; configure scripts find the compiler. GCC already - ;; provides 'c++' out of the box, strangely. - (symlink "gcc" (string-append out "/bin/cc")) - - - (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)) + + ;; Create 'cc' so that one can use it as a drop-in + ;; replacement for the default tool chain and have + ;; configure scripts find the compiler. GCC already + ;; provides 'c++' out of the box, strangely. + (symlink "gcc" (string-append #$output "/bin/cc")) + + (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)
