58 lines
1.4 KiB
Diff
58 lines
1.4 KiB
Diff
|
From 1ed21e23d6d4da8201a09558b71d9a34281e54dd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andreas Schwab <schwab@suse.de>
|
||
|
|
Date: Sun, 16 Jul 2023 19:43:56 +0200
|
||
|
|
Subject: [PATCH] Use substituted GDCFLAGS
|
||
|
|
|
||
|
|
Use the substituted value for GCDFLAGS instead of hardcoding $(CFLAGS) so
|
||
|
|
that the subdir configure scripts use the configured value.
|
||
|
|
|
||
|
|
* configure.ac (GDCFLAGS): Set default from ${CFLAGS}.
|
||
|
|
* configure: Regenerate.
|
||
|
|
* Makefile.in (GDCFLAGS): Substitute @GDCFLAGS@.
|
||
|
|
---
|
||
|
|
Makefile.in | 2 +-
|
||
|
|
configure | 1 +
|
||
|
|
configure.ac | 1 +
|
||
|
|
3 files changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.in b/Makefile.in
|
||
|
|
index 04307ca561b..144bccd2603 100644
|
||
|
|
--- a/Makefile.in
|
||
|
|
+++ b/Makefile.in
|
||
|
|
@@ -444,7 +444,7 @@ LIBCFLAGS = $(CFLAGS)
|
||
|
|
CXXFLAGS = @CXXFLAGS@
|
||
|
|
LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
|
||
|
|
GOCFLAGS = $(CFLAGS)
|
||
|
|
-GDCFLAGS = $(CFLAGS)
|
||
|
|
+GDCFLAGS = @GDCFLAGS@
|
||
|
|
GM2FLAGS = $(CFLAGS)
|
||
|
|
|
||
|
|
# Pass additional PGO and LTO compiler options to the PGO build.
|
||
|
|
diff --git a/configure b/configure
|
||
|
|
index 0d3f5c6455d..3269da9829f 100755
|
||
|
|
--- a/configure
|
||
|
|
+++ b/configure
|
||
|
|
@@ -12947,6 +12947,7 @@ fi
|
||
|
|
|
||
|
|
|
||
|
|
|
||
|
|
+GDCFLAGS=${GDCFLAGS-${CFLAGS}}
|
||
|
|
|
||
|
|
# Target tools.
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index dddab2a56d8..d07a0fa7698 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -3662,6 +3662,7 @@ AC_SUBST(CFLAGS)
|
||
|
|
AC_SUBST(CXXFLAGS)
|
||
|
|
AC_SUBST(GDC)
|
||
|
|
AC_SUBST(GDCFLAGS)
|
||
|
|
+GDCFLAGS=${GDCFLAGS-${CFLAGS}}
|
||
|
|
|
||
|
|
# Target tools.
|
||
|
|
AC_ARG_WITH([build-time-tools],
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|