guix-commits
[Top][All Lists]
Advanced

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

branch core-packages-team updated: squash! gnu: commencement: bash-final


From: guix-commits
Subject: branch core-packages-team updated: squash! gnu: commencement: bash-final: Fix build for x86_64-linux with gcc-14.
Date: Tue, 03 Dec 2024 13:23:59 -0500

This is an automated email from the git hooks/post-receive script.

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

The following commit(s) were added to refs/heads/core-packages-team by this 
push:
     new 0968a851dc squash! gnu: commencement: bash-final: Fix build for 
x86_64-linux with gcc-14.
0968a851dc is described below

commit 0968a851dce856af16eb3cb0469ce0be6846b8b6
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Dec 3 19:07:03 2024 +0100

    squash! gnu: commencement: bash-final: Fix build for x86_64-linux with 
gcc-14.
    
    Change-Id: Ic5b8b8382a545fc3af9b7bc174090e48fc3a33b4
---
 gnu/packages/commencement.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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



reply via email to

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