diff mbox series

[Ada] Fix glitch in change for PR ada/120106

Message ID 1968860.tdWV9SEqCh@fomalhaut
State New
Headers
Series [Ada] Fix glitch in change for PR ada/120106 |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_simplebootstrap_build--master-arm-bootstrap success Build passed
linaro-tcwg-bot/tcwg_gcc_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 fail Patch failed to apply

Commit Message

Eric Botcazou Sept. 30, 2026, 3:24 p.m. UTC 
  The change had introduced the GNATMAKE_FOR_BUILD Makefile variable in GCC 16, 
but a later adjustment broke its propagation, which was not quite kosher in 
any case.  The variable needs to be passed directly to sub-makes instead of 
being exported for sub-configures.

Bootstrapped/regtested on x86-64/Linux, applied on the mainline and 16 branch.


2026-09-30  Eric Botcazou  <ebotcazou@adacore.com>

	PR ada/120106
	* Makefile.def (GNATMAKE_FOR_BUILD): New flag to pass.
	* Makefile.tpl (HOST_EXPORTS): Remove GNATMAKE_FOR_BUILD.
	(BASE_TARGET_EXPORTS): Likewise.
	* Makefile.in: Regenerate.
diff mbox series

Patch

diff --git a/Makefile.def b/Makefile.def
index 6098de2904d..c31ee798bba 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -282,6 +282,7 @@  flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
 flags_to_pass = { flag= CXX_FOR_BUILD ; };
 flags_to_pass = { flag= EXPECT ; };
 flags_to_pass = { flag= FLEX ; };
+flags_to_pass = { flag= GNATMAKE_FOR_BUILD ; };
 flags_to_pass = { flag= INSTALL ; };
 flags_to_pass = { flag= INSTALL_DATA ; };
 flags_to_pass = { flag= INSTALL_PROGRAM ; };
diff --git a/Makefile.in b/Makefile.in
index 767d6aab977..7fd91da3f2d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -209,7 +209,6 @@  HOST_EXPORTS = \
 	GOC="$(GOC)"; export GOC; \
 	GDC="$(GDC)"; export GDC; \
 	GM2="$(GM2)"; export GM2; \
-	GNATMAKE_FOR_BUILD="$(GNATMAKE_FOR_BUILD)"; export GNATMAKE_FOR_BUILD; \
 	AR="$(AR)"; export AR; \
 	AS="$(AS)"; export AS; \
 	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@@ -322,7 +321,6 @@  BASE_TARGET_EXPORTS = \
 	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
 	GDC="$(GDC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GDC; \
 	GM2="$(GM2_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GM2; \
-	GNATMAKE_FOR_BUILD="$(GNATMAKE_FOR_BUILD)"; export GNATMAKE_FOR_BUILD; \
 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
 	DSYMUTIL="$(DSYMUTIL_FOR_TARGET)"; export DSYMUTIL; \
 	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
@@ -907,6 +905,7 @@  BASE_FLAGS_TO_PASS = \
 	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
 	"EXPECT=$(EXPECT)" \
 	"FLEX=$(FLEX)" \
+	"GNATMAKE_FOR_BUILD=$(GNATMAKE_FOR_BUILD)" \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
diff --git a/Makefile.tpl b/Makefile.tpl
index 07b434e4343..360c54ae5e9 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -212,7 +212,6 @@  HOST_EXPORTS = \
 	GOC="$(GOC)"; export GOC; \
 	GDC="$(GDC)"; export GDC; \
 	GM2="$(GM2)"; export GM2; \
-	GNATMAKE_FOR_BUILD="$(GNATMAKE_FOR_BUILD)"; export GNATMAKE_FOR_BUILD; \
 	AR="$(AR)"; export AR; \
 	AS="$(AS)"; export AS; \
 	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@@ -325,7 +324,6 @@  BASE_TARGET_EXPORTS = \
 	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
 	GDC="$(GDC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GDC; \
 	GM2="$(GM2_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GM2; \
-	GNATMAKE_FOR_BUILD="$(GNATMAKE_FOR_BUILD)"; export GNATMAKE_FOR_BUILD; \
 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
 	DSYMUTIL="$(DSYMUTIL_FOR_TARGET)"; export DSYMUTIL; \
 	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \