aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2024-11-03 16:12:31 +0100
committerJanneke Nieuwenhuizen <janneke@gnu.org>2024-12-03 08:33:12 +0100
commit59289e1cdd788725e5471a6a7367bcb7d6e09bf3 (patch)
tree28e3b94fe9cad6e80ca6923ee3b8038e286ce49e
parentb8c5057e50370d9f65ef7565afe11666528b341a (diff)
downloadguix-59289e1cdd788725e5471a6a7367bcb7d6e09bf3.tar
guix-59289e1cdd788725e5471a6a7367bcb7d6e09bf3.tar.gz
gnu: bash-minimal: Support [cross-]build with gcc-14.
* gnu/packages/bash-minimal.scm (bash)[arguments]: When building for the 64bit hurd, or cross-building, use "CFLAGS=-g -O2 -Wno-implicit-function-declaration". Change-Id: I1356c0aeac303bdf0254c28815716c83884008a0
-rw-r--r--gnu/packages/bash.scm8
1 files changed, 8 insertions, 0 deletions
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index 93641a78d5..56918d79bd 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2024 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -251,6 +252,13 @@ without modification.")
;; modules and related code.
"ac_cv_func_dlopen=no"
+ ,@(if (or (target-hurd64?) (%current-target-system))
+ ;; gcc-14 implictly uses -Wimplicit-function-declaration
+ ;; which together with -Werror causes:
+ ;; ./enable.def:492:11: error: implicit declaration of function ‘dlclose’;
+ '("CFLAGS=-g -O2 -Wno-implicit-function-declaration")
+ '())
+
,@(if (%current-target-system)
'("bash_cv_job_control_missing=no"
"bash_cv_getcwd_malloc=yes")