From aec19650a467c6bc92443a10a40772332d261928 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 4 Sep 2000 05:34:59 +0000 Subject: [PATCH] Makefile.in: Rebuilt. * Makefile.in: Rebuilt. * Makefile.am (GCJCOMPILE): Use -fclasspath, not the CLASSPATH environment variable. From-SVN: r36126 --- libjava/ChangeLog | 6 ++++++ libjava/Makefile.am | 2 +- 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 + + * Makefile.in: Rebuilt. + * Makefile.am (GCJCOMPILE): Use -fclasspath, not the CLASSPATH + environment variable. + 2000-09-01 Andrew Haley * 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 $@ -- 2.7.4