guix-commits
[Top][All Lists]
Advanced

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

24/40: gnu: commencement: static-bash-for-glibc Fix x86-linux build.


From: guix-commits
Subject: 24/40: gnu: commencement: static-bash-for-glibc Fix x86-linux build.
Date: Tue, 10 Dec 2024 08:30:15 -0500 (EST)

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

commit 136591bc1056999a6747db7ee96d92b7265e5045
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Dec 5 16:19:03 2024 +0100

    gnu: commencement: static-bash-for-glibc Fix x86-linux build.
    
    * gnu/packages/commencement.scm (static-bash-for-glibc): When building for
    x86-linux, add CFLAGS to #:configure-flags to relax gcc-14's strictness.
    
    Change-Id: I39f84c405c655f235841fc310e6465853dafeba7
---
 gnu/packages/commencement.scm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 1f8e7d9de3..22eacd2bdc 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3065,13 +3065,17 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker 
-Wl,~a/~a \"$@\"~%"
 
        ,@(substitute-keyword-arguments (package-arguments static-bash)
            ((#:configure-flags flags #~'())
-            ;; Add a '-L' flag so that the pseudo-cross-ld of
-            ;; BINUTILS-BOOT0 can find libc.a.
-            #~(append #$flags
-                      (list (string-append "LDFLAGS=-static -L"
-                                           (assoc-ref %build-inputs
-                                                      "libc:static")
-                                           "/lib")))))))))
+            #~(append
+               #$flags
+               #$(if (target-linux?)
+                     #~'("CFLAGS=-g -O2 -Wno-implicit-function-declaration")
+                     #~'())
+               ;; Add a '-L' flag so that the pseudo-cross-ld of
+               ;; BINUTILS-BOOT0 can find libc.a.
+               (list (string-append "LDFLAGS=-static -L"
+                                    (assoc-ref %build-inputs
+                                               "libc:static")
+                                    "/lib")))))))))
 
 (define gettext-boot0
   ;; A minimal gettext used during bootstrap.



reply via email to

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