public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/modula-2] GM2_FOR_TARGET added to all Makefile.ams in libgm2.
@ 2022-09-14 12:38 Gaius Mulley
0 siblings, 0 replies; only message in thread
From: Gaius Mulley @ 2022-09-14 12:38 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:737bcb5ef6c41ab8310ba44e26491d8f7edd3a0d
commit 737bcb5ef6c41ab8310ba44e26491d8f7edd3a0d
Author: Gaius Mulley <gaiusmod2@gmail.com>
Date: Wed Sep 14 13:37:59 2022 +0100
GM2_FOR_TARGET added to all Makefile.ams in libgm2.
Added GM2_FOR_TARGET to be substituted into all Makefile.in
in libgm2 and below. Also added GM2_FOR_TARGET into configure.ac.
libgm2/ChangeLog:
* libgm2/Makefile.am (GM2_FOR_TARGET): Added.
* libgm2/Makefile.in: Rebuilt.
* libgm2/configure: Rebuilt.
* libgm2/configure.ac (GM2_FOR_TARGET): Use AC_SUBST.
* libm2cor/Makefile.am (GM2_FOR_TARGET): Added.
* libm2cor/Makefile.in : Rebuilt.
* libm2iso/Makefile.am (GM2_FOR_TARGET): Added.
* libm2iso/Makefile.in : Rebuilt.
* libm2log/Makefile.am (GM2_FOR_TARGET): Added.
* libm2log/Makefile.in : Rebuilt.
* libm2min/Makefile.am (GM2_FOR_TARGET): Added.
* libm2min/Makefile.in : Rebuilt.
* libm2pim/Makefile.am (GM2_FOR_TARGET): Added.
* libm2pim/Makefile.in : Rebuilt.
Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
Diff:
---
libgm2/Makefile.am | 1 +
libgm2/Makefile.in | 1 +
libgm2/configure | 9 +++++++--
libgm2/configure.ac | 4 ++++
libgm2/libm2cor/Makefile.am | 1 +
libgm2/libm2cor/Makefile.in | 1 +
libgm2/libm2iso/Makefile.am | 1 +
libgm2/libm2iso/Makefile.in | 1 +
libgm2/libm2log/Makefile.am | 1 +
libgm2/libm2log/Makefile.in | 1 +
libgm2/libm2min/Makefile.am | 1 +
libgm2/libm2min/Makefile.in | 1 +
libgm2/libm2pim/Makefile.am | 1 +
libgm2/libm2pim/Makefile.in | 1 +
14 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/libgm2/Makefile.am b/libgm2/Makefile.am
index eb535eb3e3e..88d12ee325e 100644
--- a/libgm2/Makefile.am
+++ b/libgm2/Makefile.am
@@ -40,6 +40,7 @@ GM2_SRC = $(GCC_DIR)/m2
toolexeclibdir=@toolexeclibdir@
toolexecdir=@toolexecdir@
+GM2_FOR_TARGET=@GM2_FOR_TARGET@
SUBDIRS = libm2min libm2log libm2cor libm2iso libm2pim
GM2_BUILDDIR := $(shell pwd)
diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in
index 1a82e6059ac..ec9094b345d 100644
--- a/libgm2/Makefile.in
+++ b/libgm2/Makefile.in
@@ -197,6 +197,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM2_FOR_TARGET = @GM2_FOR_TARGET@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/libgm2/configure b/libgm2/configure
index 2a6259d109f..5949e87eb4e 100755
--- a/libgm2/configure
+++ b/libgm2/configure
@@ -642,6 +642,7 @@ BUILD_ISOLIB_FALSE
BUILD_ISOLIB_TRUE
BUILD_PIMLIB_FALSE
BUILD_PIMLIB_TRUE
+GM2_FOR_TARGET
CC_FOR_BUILD
enable_static
enable_shared
@@ -12673,7 +12674,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12676 "configure"
+#line 12677 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12779,7 +12780,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12782 "configure"
+#line 12783 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19498,6 +19499,10 @@ fi
CC_FOR_BUILD=${CC_FOR_BUILD:-gcc}
+# Propagate GM2_FOR_TARGET into Makefiles
+GM2_FOR_TARGET=${GM2_FOR_TARGET:-gcc}
+
+
# Now we check the target as long as it is a supported host.
# For some embedded targets we choose minimal runtime system which is
# just enough to satisfy the linker targetting raw metal.
diff --git a/libgm2/configure.ac b/libgm2/configure.ac
index 3f12defd5cf..8f069adb29e 100644
--- a/libgm2/configure.ac
+++ b/libgm2/configure.ac
@@ -300,6 +300,10 @@ fi
CC_FOR_BUILD=${CC_FOR_BUILD:-gcc}
AC_SUBST(CC_FOR_BUILD)
+# Propagate GM2_FOR_TARGET into Makefiles
+GM2_FOR_TARGET=${GM2_FOR_TARGET:-gcc}
+AC_SUBST(GM2_FOR_TARGET)
+
# Now we check the target as long as it is a supported host.
# For some embedded targets we choose minimal runtime system which is
# just enough to satisfy the linker targetting raw metal.
diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am
index e262498f768..781955bffc8 100644
--- a/libgm2/libm2cor/Makefile.am
+++ b/libgm2/libm2cor/Makefile.am
@@ -33,6 +33,7 @@ slibdir = @slibdir@
toolexeclibdir=@toolexeclibdir@
toolexecdir=@toolexecdir@
+GM2_FOR_TARGET=@GM2_FOR_TARGET@
MULTIDIR := $(shell $(CC) $(CFLAGS) -print-multi-directory)
MULTIOSDIR := $(shell $(CC) $(CFLAGS) -print-multi-os-directory)
diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in
index 5f3a2297dfb..6d921cd329d 100644
--- a/libgm2/libm2cor/Makefile.in
+++ b/libgm2/libm2cor/Makefile.in
@@ -273,6 +273,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM2_FOR_TARGET = @GM2_FOR_TARGET@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am
index 01b09ac8d51..8c6e2dcfda8 100644
--- a/libgm2/libm2iso/Makefile.am
+++ b/libgm2/libm2iso/Makefile.am
@@ -34,6 +34,7 @@ slibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
toolexeclibdir=@toolexeclibdir@
toolexecdir=@toolexecdir@
+GM2_FOR_TARGET=@GM2_FOR_TARGET@
MULTIDIR := $(shell $(CC) $(CFLAGS) -print-multi-directory)
MULTIOSDIR := $(shell $(CC) $(CFLAGS) -print-multi-os-directory)
diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in
index d3e33b0acdf..78a2efd49e0 100644
--- a/libgm2/libm2iso/Makefile.in
+++ b/libgm2/libm2iso/Makefile.in
@@ -297,6 +297,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM2_FOR_TARGET = @GM2_FOR_TARGET@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am
index 5c11bcbaa7b..728a179a5fd 100644
--- a/libgm2/libm2log/Makefile.am
+++ b/libgm2/libm2log/Makefile.am
@@ -33,6 +33,7 @@ slibdir = @slibdir@
toolexeclibdir=@toolexeclibdir@
toolexecdir=@toolexecdir@
+GM2_FOR_TARGET=@GM2_FOR_TARGET@
MULTIDIR := $(shell $(CC) $(CFLAGS) -print-multi-directory)
MULTIOSDIR := $(shell $(CC) $(CFLAGS) -print-multi-os-directory)
diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in
index 2180343ed2c..be8a59d2a56 100644
--- a/libgm2/libm2log/Makefile.in
+++ b/libgm2/libm2log/Makefile.in
@@ -262,6 +262,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM2_FOR_TARGET = @GM2_FOR_TARGET@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am
index 61948061674..667cca6f0aa 100644
--- a/libgm2/libm2min/Makefile.am
+++ b/libgm2/libm2min/Makefile.am
@@ -33,6 +33,7 @@ slibdir = @slibdir@
toolexeclibdir=@toolexeclibdir@
toolexecdir=@toolexecdir@
+GM2_FOR_TARGET=@GM2_FOR_TARGET@
MULTIDIR := $(shell $(CC) $(CFLAGS) -print-multi-directory)
MULTIOSDIR := $(shell $(CC) $(CFLAGS) -print-multi-os-directory)
diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in
index d2a5b1c9fb8..8210c2e2fa9 100644
--- a/libgm2/libm2min/Makefile.in
+++ b/libgm2/libm2min/Makefile.in
@@ -252,6 +252,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM2_FOR_TARGET = @GM2_FOR_TARGET@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am
index ced0c52e1d3..aa5904bb04e 100644
--- a/libgm2/libm2pim/Makefile.am
+++ b/libgm2/libm2pim/Makefile.am
@@ -33,6 +33,7 @@ slibdir = @slibdir@
toolexeclibdir=@toolexeclibdir@
toolexecdir=@toolexecdir@
+GM2_FOR_TARGET=@GM2_FOR_TARGET@
MULTIDIR := $(shell $(CC) $(CFLAGS) -print-multi-directory)
MULTIOSDIR := $(shell $(CC) $(CFLAGS) -print-multi-os-directory)
diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in
index 07be950683e..ed14837c0a4 100644
--- a/libgm2/libm2pim/Makefile.in
+++ b/libgm2/libm2pim/Makefile.in
@@ -287,6 +287,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM2_FOR_TARGET = @GM2_FOR_TARGET@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-09-14 12:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-14 12:38 [gcc/devel/modula-2] GM2_FOR_TARGET added to all Makefile.ams in libgm2 Gaius Mulley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).