From c5c713192a7a0c84bfad98d235e51594391c49e1 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor <ian@airs.com> Date: Tue, 29 Mar 2005 22:28:25 +0000 Subject: [PATCH] Makefile.am (GCJ_WITH_FLAGS): Add "-fclasspath=". * external/sax/Makefile.am (GCJ_WITH_FLAGS): Add "-fclasspath=". * external/sax/Makefile.in: Rebuild. * external/w3c_dom/Makefile.am (GCJ_WITH_FLAGS): Add "-fclasspath=". * external/w3c_dom/Makefile.in: Rebuild. From-SVN: r97210 --- libjava/ChangeLog | 8 ++++++++ libjava/external/sax/Makefile.am | 2 +- libjava/external/sax/Makefile.in | 2 +- libjava/external/w3c_dom/Makefile.am | 2 +- libjava/external/w3c_dom/Makefile.in | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 98a04f697c8c..499fc05694c6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2005-03-29 Ian Lance Taylor <ian@airs.com> + + * external/sax/Makefile.am (GCJ_WITH_FLAGS): Add "-fclasspath=". + * external/sax/Makefile.in: Rebuild. + * external/w3c_dom/Makefile.am (GCJ_WITH_FLAGS): Add + "-fclasspath=". + * external/w3c_dom/Makefile.in: Rebuild. + 2005-03-29 Tom Tromey <tromey@redhat.com> * java/lang/natRuntime.cc (insertSystemProperties): Set diff --git a/libjava/external/sax/Makefile.am b/libjava/external/sax/Makefile.am index 6c7ac28716bf..2d93a90532f1 100644 --- a/libjava/external/sax/Makefile.am +++ b/libjava/external/sax/Makefile.am @@ -7,7 +7,7 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) ## The compiler with whatever flags we want for both -c and -C ## compiles. -GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH) +GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fclasspath= -fbootclasspath=$(BOOTCLASSPATH) BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir) diff --git a/libjava/external/sax/Makefile.in b/libjava/external/sax/Makefile.in index 6ee3e5f0bd0f..3336f0146c4d 100644 --- a/libjava/external/sax/Makefile.in +++ b/libjava/external/sax/Makefile.in @@ -299,7 +299,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects # May be used by various substitution variables. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH) +GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fclasspath= -fbootclasspath=$(BOOTCLASSPATH) BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir) AM_GCJFLAGS = \ -B$(top_builddir) \ diff --git a/libjava/external/w3c_dom/Makefile.am b/libjava/external/w3c_dom/Makefile.am index 97235098f31e..b7ec429794cd 100644 --- a/libjava/external/w3c_dom/Makefile.am +++ b/libjava/external/w3c_dom/Makefile.am @@ -7,7 +7,7 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) ## The compiler with whatever flags we want for both -c and -C ## compiles. -GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH) +GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fclasspath= -fbootclasspath=$(BOOTCLASSPATH) BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir) diff --git a/libjava/external/w3c_dom/Makefile.in b/libjava/external/w3c_dom/Makefile.in index 934fd5feb758..acd6c025d6c6 100644 --- a/libjava/external/w3c_dom/Makefile.in +++ b/libjava/external/w3c_dom/Makefile.in @@ -299,7 +299,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects # May be used by various substitution variables. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH) +GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fclasspath= -fbootclasspath=$(BOOTCLASSPATH) BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir) AM_GCJFLAGS = \ -B$(top_builddir) \ -- GitLab