Ok for master? Bootstrapped on x86_64 gnu/linux
regards,
Gaius
---
[PR modula2/120761] GM2_FOR_BUILD is not substituted in the toplevel Makefile
This patch removes the unused GM2_FOR_BUILD in the toplevel Makefile.tpl
and removes any reference to GM2_FOR_BUILD in libgm2. The only reference
found in libgm2 was a debugging echo.
ChangeLog:
PR modula2/120761
* Makefile.in: Rebuilt.
* Makefile.tpl (GM2_FOR_BUILD): Remove.
libgm2/ChangeLog:
PR modula2/120761
* libm2min/Makefile.am (SYSTEM.def): Remove GM2_FOR_BUILD
from the debugging echo.
* libm2min/Makefile.in: Rebuilt.
diff --git a/Makefile.in b/Makefile.in
index 12d4395d8e2..90ea215ec69 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -165,8 +165,6 @@ BUILD_EXPORTS = \
GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
GDC="$(GDC_FOR_BUILD)"; export GDC; \
GDCFLAGS="$(GDCFLAGS_FOR_BUILD)"; export GDCFLAGS; \
- GM2="$(GM2_FOR_BUILD)"; export GM2; \
- GM2FLAGS="$(GM2FLAGS_FOR_BUILD)"; export GM2FLAGS; \
DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
DSYMUTIL="$(DSYMUTIL_FOR_BUILD)"; export DSYMUTIL; \
LD="$(LD_FOR_BUILD)"; export LD; \
@@ -382,7 +380,6 @@ DSYMUTIL_FOR_BUILD = @DSYMUTIL_FOR_BUILD@
GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
GOC_FOR_BUILD = @GOC_FOR_BUILD@
GDC_FOR_BUILD = @GDC_FOR_BUILD@
-GM2_FOR_BUILD = @GM2_FOR_BUILD@
GNATMAKE_FOR_BUILD = @GNATMAKE_FOR_BUILD@
LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
LD_FOR_BUILD = @LD_FOR_BUILD@
@@ -1009,7 +1006,6 @@ POSTSTAGE1_FLAGS_TO_PASS = \
CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \
GDC="$${GDC}" GDC_FOR_BUILD="$${GDC_FOR_BUILD}" \
- GM2="$${GM2}" GM2_FOR_BUILD="$${GM2_FOR_BUILD}" \
GNATBIND="$${GNATBIND}" \
LDFLAGS="$${LDFLAGS}" \
HOST_LIBS="$${HOST_LIBS}" \
diff --git a/Makefile.tpl b/Makefile.tpl
index ddcca558913..99b97ff8225 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -168,8 +168,6 @@ BUILD_EXPORTS = \
GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
GDC="$(GDC_FOR_BUILD)"; export GDC; \
GDCFLAGS="$(GDCFLAGS_FOR_BUILD)"; export GDCFLAGS; \
- GM2="$(GM2_FOR_BUILD)"; export GM2; \
- GM2FLAGS="$(GM2FLAGS_FOR_BUILD)"; export GM2FLAGS; \
DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
DSYMUTIL="$(DSYMUTIL_FOR_BUILD)"; export DSYMUTIL; \
LD="$(LD_FOR_BUILD)"; export LD; \
@@ -385,7 +383,6 @@ DSYMUTIL_FOR_BUILD = @DSYMUTIL_FOR_BUILD@
GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
GOC_FOR_BUILD = @GOC_FOR_BUILD@
GDC_FOR_BUILD = @GDC_FOR_BUILD@
-GM2_FOR_BUILD = @GM2_FOR_BUILD@
GNATMAKE_FOR_BUILD = @GNATMAKE_FOR_BUILD@
LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
LD_FOR_BUILD = @LD_FOR_BUILD@
@@ -765,7 +762,6 @@ POSTSTAGE1_FLAGS_TO_PASS = \
CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \
GDC="$${GDC}" GDC_FOR_BUILD="$${GDC_FOR_BUILD}" \
- GM2="$${GM2}" GM2_FOR_BUILD="$${GM2_FOR_BUILD}" \
GNATBIND="$${GNATBIND}" \
LDFLAGS="$${LDFLAGS}" \
HOST_LIBS="$${HOST_LIBS}" \
diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am
index b95b5dd3ea5..0947cd09174 100644
--- a/libgm2/libm2min/Makefile.am
+++ b/libgm2/libm2min/Makefile.am
@@ -132,7 +132,7 @@ libc.o: $(GM2_SRC)/gm2-libs-min/libc.c
SYSTEM.def: Makefile
- echo "CC = $(CC_FOR_BUILD) CC_FOR_TARGET = $(CC_FOR_TARGET) GM2 =
$(GM2) GM2_FOR_TARGET = $(GM2_FOR_TARGET) GM2_FOR_BUILD = $(GM2_FOR_BUILD)"
+ echo "CC = $(CC_FOR_BUILD) CC_FOR_TARGET = $(CC_FOR_TARGET) GM2 =
$(GM2) GM2_FOR_TARGET = $(GM2_FOR_TARGET) "
bash $(GM2_SRC)/tools-src/makeSystem -fpim \
$(GM2_SRC)/gm2-libs-min/SYSTEM.def \
$(GM2_SRC)/gm2-libs-min/SYSTEM.mod \
diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in
index ce0efff26ba..288f76d064a 100644
--- a/libgm2/libm2min/Makefile.in
+++ b/libgm2/libm2min/Makefile.in
@@ -765,7 +765,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
libc.o: $(GM2_SRC)/gm2-libs-min/libc.c
SYSTEM.def: Makefile
- echo "CC = $(CC_FOR_BUILD) CC_FOR_TARGET = $(CC_FOR_TARGET) GM2 =
$(GM2) GM2_FOR_TARGET = $(GM2_FOR_TARGET) GM2_FOR_BUILD = $(GM2_FOR_BUILD)"
+ echo "CC = $(CC_FOR_BUILD) CC_FOR_TARGET = $(CC_FOR_TARGET) GM2 =
$(GM2) GM2_FOR_TARGET = $(GM2_FOR_TARGET) "
bash $(GM2_SRC)/tools-src/makeSystem -fpim \
$(GM2_SRC)/gm2-libs-min/SYSTEM.def \
$(GM2_SRC)/gm2-libs-min/SYSTEM.mod \
