aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Zagórski <zagura6+github@gmail.com>2025-05-11 17:52:05 +0200
committerChris Packham <judge.packham@gmail.com>2025-06-13 21:02:44 +1200
commit93d5d7664faaf3a0e63c58cd74105c3c8364130b (patch)
tree485b464fd89962f0f1af40ed9deb970e245059f3
parenta2ef08027fbc268cde2d6985ab724e38af450cae (diff)
downloadcrosstool-ng-93d5d7664faaf3a0e63c58cd74105c3c8364130b.tar.gz
crosstool-ng-93d5d7664faaf3a0e63c58cd74105c3c8364130b.tar.bz2
crosstool-ng-93d5d7664faaf3a0e63c58cd74105c3c8364130b.zip
Use -std=c17 for companion libs, which won't build with C23 standard, default for gcc15
Signed-off-by: Michał Zagórski <zagura6+github@gmail.com>
-rw-r--r--config/comp_libs/gmp.in5
-rw-r--r--config/comp_libs/ncurses.in5
-rw-r--r--scripts/build/companion_libs/100-gmp.sh2
-rw-r--r--scripts/build/companion_libs/220-ncurses.sh2
4 files changed, 14 insertions, 0 deletions
diff --git a/config/comp_libs/gmp.in b/config/comp_libs/gmp.in
index f49d1a71..7baac528 100644
--- a/config/comp_libs/gmp.in
+++ b/config/comp_libs/gmp.in
@@ -1 +1,6 @@
# GMP options
+config GMP_EXTRA_CFLAGS
+ string "extra target CFLAGS"
+ default "-std=gnu17" if GCC_15_or_later
+ help
+ Extra target CFLAGS to use when building.
diff --git a/config/comp_libs/ncurses.in b/config/comp_libs/ncurses.in
index 4e7e6d47..3d257439 100644
--- a/config/comp_libs/ncurses.in
+++ b/config/comp_libs/ncurses.in
@@ -55,3 +55,8 @@ config NCURSES_TARGET_FALLBACKS
List of terminal descriptions that will be compiled into the curses
library for the target.
+config NCURSES_EXTRA_CFLAGS
+ string "extra target CFLAGS"
+ default "-std=gnu17" if GCC_15_or_later
+ help
+ Extra target CFLAGS fto use when building.
diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh
index 244082f8..4ecaa721 100644
--- a/scripts/build/companion_libs/100-gmp.sh
+++ b/scripts/build/companion_libs/100-gmp.sh
@@ -122,6 +122,8 @@ do_gmp_backend() {
extra_config+=("--with-pic")
fi
+ cflags+=" ${CT_GMP_EXTRA_CFLAGS}"
+
# GMP's configure script doesn't respect the host parameter
# when not cross-compiling, ie when build == host so set
# CC_FOR_BUILD and CPP_FOR_BUILD.
diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh
index c8c083ee..36aadae6 100644
--- a/scripts/build/companion_libs/220-ncurses.sh
+++ b/scripts/build/companion_libs/220-ncurses.sh
@@ -152,6 +152,8 @@ do_ncurses_backend() {
ncurses_opts+=("--with-shared")
fi
+ cflags+=" ${CT_NCURSES_EXTRA_CFLAGS}"
+
CT_DoLog EXTRA "Configuring ncurses"
CT_DoExecLog CFG \
CFLAGS="${cflags}" \