# HG changeset patch
# User ohair
# Date 1215557191 25200
# Node ID b21425229e0b1a143b676b4d3f9b09e122afcb3c
# Parent  17c572e2697c08054a27263fe14f8e0f946752fe# Parent  551f4309f4762090b0ec1050e8eccd45aed6505a
Merge

diff -r 17c572e2697c -r b21425229e0b make/linux/Queens.class
Binary file make/linux/Queens.class has changed
diff -r 17c572e2697c -r b21425229e0b make/linux/makefiles/buildtree.make
--- a/make/linux/makefiles/buildtree.make	Tue Jul 08 15:23:04 2008 -0700
+++ b/make/linux/makefiles/buildtree.make	Tue Jul 08 15:46:31 2008 -0700
@@ -328,7 +328,7 @@
 WRONG_DATA_MODE_MSG = \
 	echo "JAVA_HOME must point to $(DATA_MODE)bit JDK."
 
-test_gamma:  $(BUILDTREE_MAKE)
+test_gamma:  $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
 	@echo Creating $@ ...
 	$(QUIETLY) ( \
 	echo '#!/bin/sh'; \
@@ -339,7 +339,8 @@
 	echo "then"; \
 	echo "  $(WRONG_DATA_MODE_MSG); exit 0;"; \
 	echo "fi"; \
-	echo 'CLASSPATH="$(GAMMADIR)/make/$(OS_FAMILY):$$CLASSPATH"'; \
+	echo "rm -f Queens.class"; \
+	echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
 	echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
 	echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
 	) > $@
diff -r 17c572e2697c -r b21425229e0b make/solaris/Queens.class
Binary file make/solaris/Queens.class has changed
diff -r 17c572e2697c -r b21425229e0b make/solaris/makefiles/buildtree.make
--- a/make/solaris/makefiles/buildtree.make	Tue Jul 08 15:23:04 2008 -0700
+++ b/make/solaris/makefiles/buildtree.make	Tue Jul 08 15:46:31 2008 -0700
@@ -340,7 +340,7 @@
 WRONG_DATA_MODE_MSG = \
 	echo "JAVA_HOME must point to $(DATA_MODE)bit JDK."
 
-test_gamma:  $(BUILDTREE_MAKE)
+test_gamma:  $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
 	@echo Creating $@ ...
 	$(QUIETLY) ( \
 	echo '#!/bin/ksh'; \
@@ -351,7 +351,8 @@
 	echo "then"; \
 	echo "  $(WRONG_DATA_MODE_MSG); exit 0;"; \
 	echo "fi"; \
-	echo 'CLASSPATH="$(GAMMADIR)/make/$(OS_FAMILY):$$CLASSPATH"'; \
+	echo "rm -f Queens.class"; \
+	echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
 	echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
 	echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
 	) > $@