apply patch from gcc mailing list

see https://gcc.gnu.org/pipermail/gcc-patches/2023-December/641593.html from @tromey Change-Id: I6950d19d9ab8eb77b16f6baac1fafeb832cd1e11
cooljeanius · Jan 1, 2024 · a67f349 · a67f349
1 parent d77f0ce
commit a67f349
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/Makefile.def b/src/Makefile.def
@@ -320,6 +320,9 @@ flags_to_pass = { flag= STAGE1_CHECKING ; };
 flags_to_pass = { flag= STAGE1_LANGUAGES ; };
 flags_to_pass = { flag= GNATBIND ; };
 flags_to_pass = { flag= GNATMAKE ; };
+flags_to_pass = { flag= GDC ; };
+flags_to_pass = { flag= GDCFLAGS ; };
+flags_to_pass = { flag= GUILE ; };
 
 // Target tools
 flags_to_pass = { flag= AR_FOR_TARGET ; };

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -166,7 +166,8 @@ BASE_EXPORTS = \
 	BISON="$(BISON)"; export BISON; \
 	YACC="$(YACC)"; export YACC; \
 	M4="$(M4)"; export M4; \
-	MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
+	MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \
+	GUILE="$(GUILE)"; export GUILE;
 
 # This is the list of variables to export in the environment when
 # configuring subdirectories for the build system.
@@ -465,6 +466,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 LIBCFLAGS = $(CFLAGS) $(C_HOST_ARCHFLAGS)
 GOCFLAGS = $(CFLAGS)
+GM2FLAGS = $(CFLAGS)
 
 CCAS = @CCAS@
 CCASFLAGS = @CCASFLAGS@
@@ -506,6 +508,8 @@ WINDMC = @WINDMC@
 GNATBIND = @GNATBIND@
 GNATMAKE = @GNATMAKE@
 
+GUILE = guile
+
 YFLAGS = @YFLAGS@
 
 PICFLAG = 
@@ -923,6 +927,9 @@ BASE_FLAGS_TO_PASS = \
 	"STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \
 	"GNATBIND=$(GNATBIND)" \
 	"GNATMAKE=$(GNATMAKE)" \
+	"GDC=$(GDC)" \
+	"GDCFLAGS=$(GDCFLAGS)" \
+	"GUILE=$(GUILE)" \
 	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
 	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \

diff --git a/src/Makefile.tpl b/src/Makefile.tpl
@@ -169,7 +169,8 @@ BASE_EXPORTS = \
 	BISON="$(BISON)"; export BISON; \
 	YACC="$(YACC)"; export YACC; \
 	M4="$(M4)"; export M4; \
-	MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
+	MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \
+	GUILE="$(GUILE)"; export GUILE;
 
 # This is the list of variables to export in the environment when
 # configuring subdirectories for the build system.
@@ -468,6 +469,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 LIBCFLAGS = $(CFLAGS) $(C_HOST_ARCHFLAGS)
 GOCFLAGS = $(CFLAGS)
+GM2FLAGS = $(CFLAGS)
 
 CCAS = @CCAS@
 CCASFLAGS = @CCASFLAGS@
@@ -509,6 +511,8 @@ WINDMC = @WINDMC@
 GNATBIND = @GNATBIND@
 GNATMAKE = @GNATMAKE@
 
+GUILE = guile
+
 YFLAGS = @YFLAGS@
 
 PICFLAG =