summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2002-04-07 22:39:59 +0000
committerTom Tromey <tromey@redhat.com>2002-04-07 22:39:59 +0000
commitacf73556d8909dccde27248cf39e0cbc9654fad7 (patch)
tree187fb6681895ecdfb01e1bc779c4db51c70ec335
parentd0277cfe97c45f3aef53f354489f069d4ebb6347 (diff)
downloadclasspath-acf73556d8909dccde27248cf39e0cbc9654fad7.tar.gz
* lib/Makefile.am (JAVAC): Added -bootclasspath and
$(ARG_CLASSPATH_JAVAC) arguments.
-rw-r--r--ChangeLog5
-rw-r--r--lib/Makefile.am2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 21b69aca1..941d14123 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-06 Tom Tromey <tromey@redhat.com>
+
+ * lib/Makefile.am (JAVAC): Added -bootclasspath and
+ $(ARG_CLASSPATH_JAVAC) arguments.
+
2002-04-07 Mark Wielaard <mark@klomp.org>
* java/util/Hashtable.java (contains): Remove NullPointer check.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2fa2e170c..7f27bb825 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -48,7 +48,7 @@ if FOUND_JIKES
JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes
else
if FOUND_GCJ
-JAVAC = $(GCJ) -C -d . @classes
+JAVAC = $(GCJ) -bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes
else
if FOUND_KJC
JAVAC = $(USER_JABBA) $(ARG_CLASSPATH_VM) $(KJC_CLASSPATH):$(USER_CLASSLIB) $(KJC_MAIN) $(ARG_CLASSPATH_JAVAC) .:$(USER_CLASSLIB) -d . @classes