diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-13 19:01:20 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-13 19:01:20 +0000 |
| commit | 374d695e5c17fcba5ef9dee9ad43640bbe72b2ad (patch) | |
| tree | 427a923d1da120f6f4f412f22ed9a9be51c17938 /libjava/Makefile.am | |
| parent | fa3f0d94aa07e26543ae03d87dfd64d06969ab8c (diff) | |
| download | ppe42-gcc-374d695e5c17fcba5ef9dee9ad43640bbe72b2ad.tar.gz ppe42-gcc-374d695e5c17fcba5ef9dee9ad43640bbe72b2ad.zip | |
2000-09-13 Alexandre Oliva <aoliva@redhat.com>
* configure.in (LIBDATASTARTSPEC): Use `%s' to search for
libgcjdata.a.
(GCJ): Support single-tree builds. Add -B`pwd`/ and -I$srcdir.
* acinclude.m4: Arrange for automake to not bring in a new
libtool.m4 for LT_AC_PROG_GCJ. AC_SUBST GCJ.
* Makefile.am: Leave it up to automake to subst GCJ.
* aclocal.m4, configure, Makefile.in: Rebuilt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36392 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 3b4ff931501..909d8f0a43b 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -51,10 +51,8 @@ if CANADIAN if NULL_TARGET ## In this case, gcj is found outside the build tree. However, zip is ## found in the build tree. -GCJ = gcj ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT) else -GCJ = $(target_alias)-gcj ZIP = zip endif GCJH = gcjh @@ -63,8 +61,6 @@ else # CANADIAN ## (due to problems running it in builddir). In this case the obvious ## definition of GCJ won't work; instead we resort to this ugly ## definition that gives us absolute paths. -expanded = `cd $(MULTIBUILDTOP)../$(COMPPATH)/gcc && pwd` -GCJ = $(expanded)/gcj$(EXEEXT) -B$(expanded)/ GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT) ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT) endif # CANADIAN |
