Mercurial > hg > truffle

comparison make/linux/makefiles/buildtree.make @ 1696:688a538aa654

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Fri, 13 Aug 2010 10:55:42 -0700
parents 126ea7725993
children f95d63e2154a c7db7adb83b4
comparison
equal deleted inserted replaced
1673:6709c14587c2 1696:688a538aa654
337 JAVA_FLAG/64 = -d64 337 JAVA_FLAG/64 = -d64
338 338
339 WRONG_DATA_MODE_MSG = \ 339 WRONG_DATA_MODE_MSG = \
340 echo "JAVA_HOME must point to $(DATA_MODE)bit JDK." 340 echo "JAVA_HOME must point to $(DATA_MODE)bit JDK."
341 341
342 CROSS_COMPILING_MSG = \
343 echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run."
344
342 test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java 345 test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
343 @echo Creating $@ ... 346 @echo Creating $@ ...
344 $(QUIETLY) ( \ 347 $(QUIETLY) ( \
345 echo '#!/bin/sh'; \ 348 echo '#!/bin/sh'; \
346 $(BUILDTREE_COMMENT); \ 349 $(BUILDTREE_COMMENT); \
347 echo '. ./env.sh'; \ 350 echo '. ./env.sh'; \
351 echo "if [ \"$(CROSS_COMPILE_ARCH)\" != \"\" ]; then { $(CROSS_COMPILING_MSG); exit 0; }; fi"; \
348 echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \ 352 echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
349 echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \ 353 echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
350 echo "then"; \ 354 echo "then"; \
351 echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \ 355 echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \
352 echo "fi"; \ 356 echo "fi"; \