Mercurial > hg > truffle
comparison make/linux/makefiles/buildtree.make @ 7482:989155e2d07a
Merge with hs25-b15.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 16 Jan 2013 01:34:24 +0100 |
parents | e522a00b91aa 892acf0431ef |
children | ed3fa3ae7b61 |
comparison
equal
deleted
inserted
replaced
7381:6761a8f854a4 | 7482:989155e2d07a |
---|---|
440 echo "if [ \$$? -ne 0 ]; then "; \ | 440 echo "if [ \$$? -ne 0 ]; then "; \ |
441 echo " $(WRONG_DATA_MODE_MSG)"; \ | 441 echo " $(WRONG_DATA_MODE_MSG)"; \ |
442 echo " exit 0"; \ | 442 echo " exit 0"; \ |
443 echo "fi"; \ | 443 echo "fi"; \ |
444 echo ""; \ | 444 echo ""; \ |
445 echo "# Use gamma_g if it exists"; \ | |
446 echo ""; \ | |
447 echo "GAMMA_PROG=gamma"; \ | 445 echo "GAMMA_PROG=gamma"; \ |
448 echo "if [ -f gamma_g ]; then "; \ | |
449 echo " GAMMA_PROG=gamma_g"; \ | |
450 echo "fi"; \ | |
451 echo ""; \ | 446 echo ""; \ |
452 echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \ | 447 echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \ |
453 echo " # Ensure architecture for gamma and JAVA_HOME is the same."; \ | 448 echo " # Ensure architecture for gamma and JAVA_HOME is the same."; \ |
454 echo " # NOTE: gamma assumes the OpenJDK directory layout."; \ | 449 echo " # NOTE: gamma assumes the OpenJDK directory layout."; \ |
455 echo ""; \ | 450 echo ""; \ |