From: Andreas Schwab <schwab@suse.de>
Date: Sat, 2 Nov 2002 16:14:50 +0000 (+0000)
Subject: Makefile.am (AM_MAKEFLAGS): Don't pass JC1FLAGS, CC and CXX, do pass GCJFLAGS.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbf6552920d38c1b0c1422d288f395a5323aff28;p=gcc.git

Makefile.am (AM_MAKEFLAGS): Don't pass JC1FLAGS, CC and CXX, do pass GCJFLAGS.

	* Makefile.am (AM_MAKEFLAGS): Don't pass JC1FLAGS, CC and CXX, do
	pass GCJFLAGS.
	(FLAGS_TO_PASS): Define.
	* Makefile.in: Regenerated.

From-SVN: r58752
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 66d6f5e828f..99c75464452 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-02  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.am (AM_MAKEFLAGS): Don't pass JC1FLAGS, CC and CXX, do
+	pass GCJFLAGS.
+	(FLAGS_TO_PASS): Define.
+	* Makefile.in: Regenerated.
+
 2002-11-01  Michael Koch  <konqueror@gmx.de>
 
 	* java/nio/ByteOrder.java: New file.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index e55c964fe9e..861b5ab211c 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -2448,7 +2448,7 @@ AM_MAKEFLAGS = \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
 	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-	"JC1FLAGS=$(JC1FLAGS)" \
+	"GCJFLAGS=$(GCJFLAGS)" \
 	"LDFLAGS=$(LDFLAGS)" \
 	"LIBCFLAGS=$(LIBCFLAGS)" \
 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
@@ -2464,8 +2464,6 @@ AM_MAKEFLAGS = \
 	"prefix=$(prefix)" \
 	"AR=$(AR)" \
 	"AS=$(AS)" \
-	"CC=$(CC)" \
-	"CXX=$(CXX)" \
 	"LD=$(LD)" \
 	"LIBCFLAGS=$(LIBCFLAGS)" \
 	"NM=$(NM)" \
@@ -2473,6 +2471,9 @@ AM_MAKEFLAGS = \
 	"RANLIB=$(RANLIB)" \
 	"DESTDIR=$(DESTDIR)"
 
+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+
 CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
 
 MAKEOVERRIDES=
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 02093faa799..cd06f284648 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -2138,7 +2138,7 @@ AM_MAKEFLAGS = \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
 	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-	"JC1FLAGS=$(JC1FLAGS)" \
+	"GCJFLAGS=$(GCJFLAGS)" \
 	"LDFLAGS=$(LDFLAGS)" \
 	"LIBCFLAGS=$(LIBCFLAGS)" \
 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
@@ -2154,8 +2154,6 @@ AM_MAKEFLAGS = \
 	"prefix=$(prefix)" \
 	"AR=$(AR)" \
 	"AS=$(AS)" \
-	"CC=$(CC)" \
-	"CXX=$(CXX)" \
 	"LD=$(LD)" \
 	"LIBCFLAGS=$(LIBCFLAGS)" \
 	"NM=$(NM)" \
@@ -2164,6 +2162,9 @@ AM_MAKEFLAGS = \
 	"DESTDIR=$(DESTDIR)"
 
 
+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+
 CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
 
 MAKEOVERRIDES =