diff options
| author | Tom Tromey <tromey@cygnus.com> | 2000-09-04 05:34:59 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-09-04 05:34:59 +0000 |
| commit | aec19650a467c6bc92443a10a40772332d261928 (patch) | |
| tree | a216bfecb0ac516c148d2391938eceadfd96e740 /libjava | |
| parent | 1b84dc3709f339801f34093ccece9f484ff2b60e (diff) | |
| download | gcc-aec19650a467c6bc92443a10a40772332d261928.zip gcc-aec19650a467c6bc92443a10a40772332d261928.tar.gz gcc-aec19650a467c6bc92443a10a40772332d261928.tar.bz2 | |
Makefile.in: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (GCJCOMPILE): Use -fclasspath, not the CLASSPATH
environment variable.
From-SVN: r36126
Diffstat (limited to 'libjava')
| -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 a8a8b00..1b8932f 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 beecd8c..b296368 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 630bb27..5da8d91 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 $@ |