>From 922152d7faf82f2d68fd23a526bab613a4339501 Mon Sep 17 00:00:00 2001
From: Vegard Nossum <vegard.nos...@gmail.com>
Date: Sat, 27 Jun 2009 14:39:15 +0200
Subject: [PATCH] build: depend on building the runtime classes for compiling
jato
We'll want to make sure that the runtime classes have been built (if
they changed) before jato is built. Previously we only depended on
these classes from the unit tests, which was wrong.
Signed-off-by: Vegard Nossum <vegard.nos...@gmail.com>
---
Makefile | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index b74bc87..4cc6c54 100644
--- a/Makefile
+++ b/Makefile
@@ -135,6 +135,11 @@ JATO_OBJS = $(ARCH_OBJS) $(JIT_OBJS) $(VM_OBJS)
$(CAFEBABE_OBJS)
OBJS = $(JAMVM_OBJS) $(JATO_OBJS)
+RUNTIME_CLASSES = \
+ runtime/classpath/gnu/classpath/VMStackWalker.class \
+ runtime/classpath/gnu/classpath/VMSystemProperties.class \
+ runtime/classpath/java/lang/VMSystem.class
+
AS := as
CC := gcc
MONOBURG := ./monoburg/monoburg
@@ -191,7 +196,7 @@ arch/$(ARCH)/insn-selector$(ARCH_POSTFIX).c: monoburg FORCE
$(E) " MONOBURG" $@
$(Q) $(MONOBURG) -p -e $(@:.c=.brg) > $@
-$(PROGRAM): monoburg $(JAMVM_ARCH_H) compile
+$(PROGRAM): monoburg $(JAMVM_ARCH_H) compile $(RUNTIME_CLASSES)
$(E) " CC " $@
$(Q) $(CC) -T $(LINKER_SCRIPT) $(DEFAULT_CFLAGS) $(CFLAGS) $(OBJS) -o
$(PROGRAM) $(LIBS) $(DEFAULT_LIBS)
@@ -233,11 +238,6 @@ $(REGRESSION_TEST_SUITE_CLASSES): %.class: %.java
$(E) " JAVAC " $@
$(Q) $(JAVAC) -cp $(GLIBJ):regression $(JAVAC_OPTS) -d regression $<
-RUNTIME_CLASSES = \
- runtime/classpath/gnu/classpath/VMStackWalker.class \
- runtime/classpath/gnu/classpath/VMSystemProperties.class \
- runtime/classpath/java/lang/VMSystem.class
-
$(RUNTIME_CLASSES): %.class: %.java
$(E) " JAVAC " $@
$(Q) $(JAVAC) -cp $(GLIBJ) $(JAVAC_OPTS) -d runtime/classpath $<
@@ -246,7 +246,7 @@ lib: $(CLASSPATH_CONFIG)
make -C lib/ JAVAC=$(JAVAC) GLIBJ=$(GLIBJ)
.PHONY: lib
-regression: monoburg $(CLASSPATH_CONFIG) $(PROGRAM)
$(REGRESSION_TEST_SUITE_CLASSES) $(RUNTIME_CLASSES)
+regression: monoburg $(CLASSPATH_CONFIG) $(PROGRAM)
$(REGRESSION_TEST_SUITE_CLASSES)
$(E) " REGRESSION"
$(Q) cd regression && /bin/bash run-suite.sh $(JAVA_OPTS)
.PHONY: regression
--
1.6.0.4
------------------------------------------------------------------------------
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
