diff options
| author | Mark Wielaard <mark@klomp.org> | 2006-12-07 23:04:53 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2006-12-07 23:04:53 +0000 |
| commit | bd19849e46d09d1ef0f95512546809b506b730f5 (patch) | |
| tree | 1e6c72638bafafc906c332f21e9f1a10aefdfd67 | |
| parent | 8c888b190b7a20752666635778ec36eadfc6785a (diff) | |
| download | classpath-bd19849e46d09d1ef0f95512546809b506b730f5.tar.gz | |
* tools/Makefile.am: Explicitly define and use bootclasspath as
GLIBJ_BOOTCLASSPATH
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | tools/Makefile.am | 11 |
2 files changed, 11 insertions, 5 deletions
@@ -1,5 +1,10 @@ 2006-12-07 Mark Wielaard <mark@klomp.org> + * tools/Makefile.am: Explicitly define and use bootclasspath as + GLIBJ_BOOTCLASSPATH + +2006-12-07 Mark Wielaard <mark@klomp.org> + * javax/swing/JEditorPane.java (createEditorKitForContentType): Always load from system class loader. diff --git a/tools/Makefile.am b/tools/Makefile.am index d1346cc37..1a76e0cec 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,19 +1,20 @@ ## Input file for automake to generate the Makefile.in used by configure -GLIBJ_CLASSPATH='$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip':asm +GLIBJ_BOOTCLASSPATH='$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip' +GLIBJ_CLASSPATH=asm # Setup the compiler to use the GNU Classpath library we just build if FOUND_GCJ -JCOMPILER = $(GCJ) -encoding UTF-8 --bootclasspath $(GLIBJ_CLASSPATH) --classpath . -C +JCOMPILER = $(GCJ) -encoding UTF-8 --bootclasspath $(GLIBJ_BOOTCLASSPATH) --classpath $(GLIBJ_CLASSPATH):. -C else if FOUND_JIKES -JCOMPILER = $(JIKES) $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(GLIBJ_CLASSPATH):. +JCOMPILER = $(JIKES) $(JIKESENCODING) -bootclasspath '$(GLIBJ_BOOTCLASSPATH)' -extdirs '' -sourcepath '' --classpath $(GLIBJ_CLASSPATH):. else if FOUND_GCJX -JCOMPILER = $(GCJX) -encoding UTF-8 -bootclasspath '' -sourcepath '' -classpath $(GLIBJ_CLASSPATH):. +JCOMPILER = $(GCJX) -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -sourcepath '' -classpath $(GLIBJ_CLASSPATH):. else if FOUND_ECJ -JCOMPILER = $(ECJ) -source 1.4 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath . +JCOMPILER = $(ECJ) -source 1.4 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) else error dunno how to setup the JCOMPILER and compile endif |