This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Fix makefile for bi-arch
- From: Andreas Schwab <schwab at suse dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Tue, 29 Oct 2002 10:59:13 +0100
- Subject: Fix makefile for bi-arch
This fixes the libjava toplevel makefile for bi-arch configurations.
Andreas.
2002-10-29 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.
Index: libjava/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.253
diff -u -p -a -u -p -a -r1.253 Makefile.am
--- libjava/Makefile.am 7 Oct 2002 13:56:37 -0000 1.253
+++ libjava/Makefile.am 29 Oct 2002 09:50:55 -0000
@@ -2435,7 +2435,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)" \
@@ -2451,14 +2451,15 @@ AM_MAKEFLAGS = \
"prefix=$(prefix)" \
"AR=$(AR)" \
"AS=$(AS)" \
- "CC=$(CC)" \
- "CXX=$(CXX)" \
"LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \
"PICFLAG=$(PICFLAG)" \
"RANLIB=$(RANLIB)" \
"DESTDIR=$(DESTDIR)"
+
+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
--
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."