This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[gcjx] Patch: FYI: boot class path
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 17 May 2005 18:05:04 -0600
- Subject: [gcjx] Patch: FYI: boot class path
- Reply-to: tromey at redhat dot com
I'm checking this in on the gcjx branch.
We weren't setting the default boot class path for the gcc driver.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* driver.cc (post_options): Set default boot class path.
* Make-lang.in (java/driver.o): New target.
Index: Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Make-lang.in,v
retrieving revision 1.151.2.6
diff -u -r1.151.2.6 Make-lang.in
--- Make-lang.in 27 Mar 2005 03:01:24 -0000 1.151.2.6
+++ Make-lang.in 18 May 2005 00:07:29 -0000
@@ -228,6 +228,11 @@
%.o: %.cc
$(CXX) $(CXXFLAGS) $(gcc_java_cxxflags) -c -o $@ $<
+java/driver.o: java/driver.cc
+ $(CXX) $(CXXFLAGS) \
+ -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \
+ $(gcc_java_cxxflags) -c -o $@ $<
+
java/boehm.o: java/boehm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(TREE_H) toplev.h
java/jvgenmain.o: java/jvgenmain.c $(CONFIG_H) $(SYSTEM_H) \
Index: driver.cc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Attic/driver.cc,v
retrieving revision 1.1.2.5
diff -u -r1.1.2.5 driver.cc
--- driver.cc 29 Apr 2005 02:58:51 -0000 1.1.2.5
+++ driver.cc 18 May 2005 00:07:29 -0000
@@ -353,10 +353,18 @@
assert (*filename_ptr);
arguments->filename = *filename_ptr;
+ // FIXME: GCC_EXEC_PREFIX handling.
+
// Compute the class path.
std::list<class_factory *> facs;
if (arguments->bootclasspath != NULL)
add_cp (facs, split (arguments->bootclasspath, ':'));
+ else
+ {
+ std::list<std::string> bc;
+ bc.push_back (LIBGCJ_ZIP_FILE);
+ add_cp (facs, bc);
+ }
if (arguments->classpath != NULL)
add_cp (facs, split (arguments->classpath, ':'));
add_cp (facs, arguments->dash_i_args);