diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-04 05:34:59 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-04 05:34:59 +0000 |
| commit | 10817736c17fb7dab8783bce267bd08726d0b5ca (patch) | |
| tree | a216bfecb0ac516c148d2391938eceadfd96e740 | |
| parent | 8386bfa5d01457896eaa9b0021696af0c263e6fe (diff) | |
| download | gcc-10817736c17fb7dab8783bce267bd08726d0b5ca.tar.gz | |
* Makefile.in: Rebuilt.
* Makefile.am (GCJCOMPILE): Use -fclasspath, not the CLASSPATH
environment variable.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36126 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a8a8b007a39..1b8932fb01f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2000-09-02 Tom Tromey <tromey@cygnus.com> + + * Makefile.in: Rebuilt. + * Makefile.am (GCJCOMPILE): Use -fclasspath, not the CLASSPATH + environment variable. + 2000-09-01 Andrew Haley <aph@redhat.com> * java/io/StreamTokenizer.java: Don't throw a diff --git a/libjava/Makefile.am b/libjava/Makefile.am index beecd8c1fa1..b29636842e9 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -69,7 +69,7 @@ GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT) ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT) endif # CANADIAN -GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c +GCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -c GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 630bb27659a..5da8d91c5e7 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -158,7 +158,7 @@ bin_SCRIPTS = addr2name.awk @CANADIAN_FALSE@expanded = \ @CANADIAN_FALSE@`cd $(MULTIBUILDTOP)../$(COMPPATH)/gcc && pwd` -GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c +GCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -c GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ |