diff options
| author | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-07-16 21:04:58 +0000 |
|---|---|---|
| committer | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-07-16 21:04:58 +0000 |
| commit | 88a09153515cca1388a7284174c5ff5ae4b93cb0 (patch) | |
| tree | 27111cd63e23f79a51befc8a5168955de5f5650c /libjava/Makefile.am | |
| parent | 8e7912a531869136f2b5796884c49cc0a7d578d2 (diff) | |
| download | ppe42-gcc-88a09153515cca1388a7284174c5ff5ae4b93cb0.tar.gz ppe42-gcc-88a09153515cca1388a7284174c5ff5ae4b93cb0.zip | |
* Makefile.am: Set ZIP and GCJH directly using autoconf.
* Makefile.in, include/Makefile.in, testsuite/Makefile.in,
gcj/Makefile.in: Regenerate.
* configure.in: Set ZIP and GCJH. Remove redundant condition
in AM_CONDITIONAL(NATIVE,...)
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84832 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index ef3a7bbc4c8..a7e79b4748e 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -71,22 +71,8 @@ bin_SCRIPTS = addr2name.awk ## Compilers and compilation flags. ## -## CANADIAN is a misnomer. Really we check to see if we must pick up -## the tools from the path. -if CANADIAN -if NULL_TARGET -## In this case, gcj is found outside the build tree. However, zip is -## found in the build tree. -ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar -GCJH = gcjh -else -ZIP = jar -GCJH = $(target_noncanonical)-gcjh -endif -else # CANADIAN -GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh -ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar -endif # CANADIAN +GCJH = @GCJH@ +ZIP = @ZIP@ ## The compiler with whatever flags we want for both -c and -C ## compiles. |
