comparison make/linux/makefiles/buildtree.make @ 1930:2d26b0046e0d

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 30 Nov 2010 14:53:30 +0100
parents 126ea7725993
children f95d63e2154a c7db7adb83b4
comparison
equal deleted inserted replaced
1484:6b7001391c97 1930:2d26b0046e0d
1 # 1 #
2 # Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. 2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
14 # 14 #
15 # You should have received a copy of the GNU General Public License version 15 # You should have received a copy of the GNU General Public License version
16 # 2 along with this work; if not, write to the Free Software Foundation, 16 # 2 along with this work; if not, write to the Free Software Foundation,
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 # 18 #
19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 # CA 95054 USA or visit www.sun.com if you need additional information or 20 # or visit www.oracle.com if you need additional information or have any
21 # have any questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 # Usage: 25 # Usage:
26 # 26 #
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"; \