summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2024-12-12 14:08:27 +0100
committerAndreas Enge <andreas@enge.fr>2025-07-18 20:17:15 +0200
commit433d345764cadaca17583237b1b10c915bf5e034 (patch)
tree4c7859574bd1ad2615d484494d8461a804ea269c
parent4c98f0d1f45cac9e86311b7b033f6c474fff74c6 (diff)
bash-minimal: Use gcc-14 hurd/x86-linux build fix for all platforms.
* gnu/packages/bash.scm (bash-minimal)[arguments]: Unconditionally add CFLAGS to #:configure-flags to relax gcc-14's strictness. Change-Id: Ifd502adf8c53aa960c02a50bc5bd498bfb9858f6
-rw-r--r--gnu/packages/bash.scm12
1 files changed, 2 insertions, 10 deletions
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index 27d46fbaab3..7598fa1c103 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -291,7 +291,8 @@ without modification.")
291 (srfi srfi-1) 291 (srfi srfi-1)
292 (srfi srfi-26))) 292 (srfi srfi-26)))
293 ((#:configure-flags flags '()) 293 ((#:configure-flags flags '())
294 `(list "--without-bash-malloc" 294 `(list "CFLAGS=-g -O2 -Wno-error=implicit-function-declaration"
295 "--without-bash-malloc"
295 "--disable-readline" 296 "--disable-readline"
296 "--disable-history" 297 "--disable-history"
297 "--disable-help-builtin" 298 "--disable-help-builtin"
@@ -303,15 +304,6 @@ without modification.")
303 ;; modules and related code. 304 ;; modules and related code.
304 "ac_cv_func_dlopen=no" 305 "ac_cv_func_dlopen=no"
305 306
306 ,@(if (or (target-hurd64?)
307 (%current-target-system)
308 (and (target-x86?) (target-linux?)))
309 ;; gcc-14 implictly uses -Wimplicit-function-declaration
310 ;; which together with -Werror causes:
311 ;; ./enable.def:492:11: error: implicit declaration of function ‘dlclose’;
312 '("CFLAGS=-g -O2 -Wno-error=implicit-function-declaration")
313 '())
314
315 ,@(if (%current-target-system) 307 ,@(if (%current-target-system)
316 '("bash_cv_job_control_missing=no" 308 '("bash_cv_job_control_missing=no"
317 "bash_cv_getcwd_malloc=yes") 309 "bash_cv_getcwd_malloc=yes")