Hi Tom,
On Thu, 2006-12-07 at 10:08 -0700, Tom Tromey wrote:
> I've already imported the ASM 2.2.3 sources. This updates the tools
> build code to compile ASM and to put the results into tools.zip. It
> also removes the old code for finding a separate ASM library.
Small issue with building. Some compilers (jikes) want the bootclass
classes really on the bootclasspath. This patch makes it so:
2006-12-07 Mark Wielaard <[EMAIL PROTECTED]>
* tools/Makefile.am: Explicitly define and use bootclasspath
as GLIBJ_BOOTCLASSPATH
builder.classpath.org also points out that make distcheck is broken. I
have not investigated that yet. See
http://article.gmane.org/gmane.comp.java.classpath.testresults/3223
Could you take a look?
Thanks,
Mark
Index: tools/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.26
diff -u -r1.26 Makefile.am
--- tools/Makefile.am 7 Dec 2006 17:22:53 -0000 1.26
+++ tools/Makefile.am 7 Dec 2006 23:04:08 -0000
@@ -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
