guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/06: squash! gnu: commencement: bash-final: Fix build for x86_64-linux


From: guix-commits
Subject: 05/06: squash! gnu: commencement: bash-final: Fix build for x86_64-linux with gcc-14.
Date: Tue, 3 Dec 2024 11:19:37 -0500 (EST)

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

commit a3ca244381958f250848b2cd86d0d145e6db5110
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Dec 3 17:14:26 2024 +0100

    squash! gnu: commencement: bash-final: Fix build for x86_64-linux with 
gcc-14.
    
    bash has no #:configure-flags to substitute...
    
    Change-Id: If7d0001e592666513908d0df8e61508d8674dd1d
---
 gnu/packages/commencement.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 36eeb4bf17..7128c3c8af 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3405,10 +3405,8 @@ exec \"$@\" \
          ;; Doing it here rather than in `bash-minimal' or `static-bash'
          ;; avoids a boot0-world rebuild.
          ,@(if (and (target-x86-64?) (target-linux?))
-               (substitute-keyword-arguments (package-arguments bash)
-                 ((#:configure-flags flags '())
-                  #~(append #$flags
-                            '("CFLAGS=-g -O2 
-Wno-implicit-function-declaration"))))
+               `(#:configure-flags
+                 '("CFLAGS=-g -O2 -Wno-implicit-function-declaration"))
                (package-arguments bash)))))))
 
 (define (%boot4-inputs)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]