Mercurial > hg > truffle
diff make/linux/makefiles/buildtree.make @ 1696:688a538aa654
Merge
author | trims |
---|---|
date | Fri, 13 Aug 2010 10:55:42 -0700 |
parents | 126ea7725993 |
children | f95d63e2154a c7db7adb83b4 |
line wrap: on
line diff
--- a/make/linux/makefiles/buildtree.make Fri Aug 06 12:51:54 2010 -0700 +++ b/make/linux/makefiles/buildtree.make Fri Aug 13 10:55:42 2010 -0700 @@ -339,12 +339,16 @@ WRONG_DATA_MODE_MSG = \ echo "JAVA_HOME must point to $(DATA_MODE)bit JDK." +CROSS_COMPILING_MSG = \ + echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run." + test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java @echo Creating $@ ... $(QUIETLY) ( \ echo '#!/bin/sh'; \ $(BUILDTREE_COMMENT); \ echo '. ./env.sh'; \ + echo "if [ \"$(CROSS_COMPILE_ARCH)\" != \"\" ]; then { $(CROSS_COMPILING_MSG); exit 0; }; fi"; \ echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \ echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \ echo "then"; \