diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-26 22:56:15 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-26 22:56:15 +0000 |
| commit | 1898595630a660c0a402cb5f9d4c205d5f2855b5 (patch) | |
| tree | 153f435249da426ecf36e8a62d8c3b67847f7bb8 /libjava/Makefile.am | |
| parent | cc69b203282e88958126242e438ae60dc06533df (diff) | |
| download | ppe42-gcc-1898595630a660c0a402cb5f9d4c205d5f2855b5.tar.gz ppe42-gcc-1898595630a660c0a402cb5f9d4c205d5f2855b5.zip | |
2003-07-26 Mohan Embar <gnustuff@thisiscool.com>
Ranjit Mathew <rmathew@hotmail.com>
* Makefile.am: Use cross-compiling gcjh from the path for
a crossed-native build.
* Makefile.in: Rebuilt.
* configure.in: Include libltdl in non-newlib builds.
Moved determination of gcj used to build libraries to
its own section. Fixed cross-compilation issues for
non-newlib builds.
* configure: Rebuilt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69836 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 4e02c07ab4a..23a071c0719 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -64,10 +64,11 @@ 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_alias)-gcjh endif -GCJH = gcjh else # CANADIAN GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar |
