guix_mirror_bot pushed a commit to branch core-packages-team
in repository guix.

commit a296c6e66509df73f449ea22f7c268891a5209dd
Author: Nicolas Graves <[email protected]>
AuthorDate: Sat Feb 21 18:41:28 2026 +0100

    gnu: libstdc++: Improve style.
    
    * gnu/packages/commencement.scm (libstdc++)[arguments]: Improve style,
    use G-expressions and substitute-keyword-arguments.
    
    Change-Id: I72314754ed9e10f2702f2c7ea8d142bba36e5b49
    Signed-off-by: Ludovic Courtès <[email protected]>
---
 gnu/packages/commencement.scm | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 16061932350..4303f8b5c71 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3261,23 +3261,22 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker 
-Wl,~a/~a \"$@\"~%"
       (inherit lib)
       (source (bootstrap-origin (package-source lib)))
       (arguments
-       `(#:guile ,%bootstrap-guile
-         #:implicit-inputs? #f
-         #:allowed-references ("out")
+       (cons*
+        #:guile %bootstrap-guile
+        #:implicit-inputs? #f
+        #:allowed-references '("out")
 
-         ;; XXX: libstdc++.so NEEDs ld.so for some reason.
-         #:validate-runpath? #f
+        ;; XXX: libstdc++.so NEEDs ld.so for some reason.
+        #:validate-runpath? #f
 
-         ;; All of the package arguments from 'make-libstdc++
-         ;; except for the configure-flags.
-         ,@(package-arguments lib)
-         #:configure-flags `("--disable-shared"
-                             "--disable-libstdcxx-dual-abi"
-                             "--disable-libstdcxx-threads"
-                             "--disable-libstdcxx-pch"
-                             ,(string-append "--with-gxx-include-dir="
-                                             (assoc-ref %outputs "out")
-                                             "/include"))))
+        (substitute-keyword-arguments (package-arguments lib)
+          ((#:configure-flags _)
+           #~(list "--disable-shared"
+                   "--disable-libstdcxx-dual-abi"
+                   "--disable-libstdcxx-threads"
+                   "--disable-libstdcxx-pch"
+                   (string-append "--with-gxx-include-dir="
+                                  #$output "/include"))))))
       (outputs '("out"))
       (inputs (%boot2-inputs))
       (synopsis "GNU C++ standard library (intermediate)"))))

Reply via email to