diff options
| author | Andreas Schwab <schwab@suse.de> | 2002-11-02 16:14:50 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2002-11-02 16:14:50 +0000 |
| commit | bbf6552920d38c1b0c1422d288f395a5323aff28 (patch) | |
| tree | 9eab0f2c90e0eafd8c918a932688d892ebc2f013 /libjava/Makefile.am | |
| parent | 7dbedeb4e6ee8142c765f39e6c9c273710404ff5 (diff) | |
| download | gcc-bbf6552920d38c1b0c1422d288f395a5323aff28.zip gcc-bbf6552920d38c1b0c1422d288f395a5323aff28.tar.gz gcc-bbf6552920d38c1b0c1422d288f395a5323aff28.tar.bz2 | |
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
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index e55c964..861b5ab 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= |