Mercurial > hg > release > icedtea7-forest-2.2 > hotspot
changeset 3461:b11130d646c2 icedtea-2.2
Merge
author | andrew |
---|---|
date | Wed, 16 May 2012 14:49:26 +0100 |
parents | e26080e754c6 (current diff) 5be91de8b779 (diff) |
children | bfe5efd70bce |
files | |
diffstat | 1 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/makefiles/gcc.make Wed May 02 13:12:35 2012 -0400 +++ b/make/linux/makefiles/gcc.make Wed May 16 14:49:26 2012 +0100 @@ -26,40 +26,40 @@ # CC, CXX & AS ifndef HOST_GCC +ifdef CROSS_COMPILE_ARCH HOST_GCC = gcc +else +HOST_GCC = $(CC) +endif endif -ifndef HOST_CPP -HOST_CPP = g++ +ifndef HOST_CXX +ifdef CROSS_COMPILE_ARCH +HOST_CXX = g++ +else +HOST_CXX = $(CXX) +endif endif ifndef BUILD_GCC ifdef CROSS_COMPILE_ARCH BUILD_GCC = $(ALT_COMPILER_PATH)/gcc -CXX = $(ALT_COMPILER_PATH)/g++ -CC = $(ALT_COMPILER_PATH)/gcc -HOSTCXX = g++ -HOSTCC = gcc else BUILD_GCC = gcc -CXX = g++ -CC = gcc -HOSTCXX = $(CXX) -HOSTCC = $(CC) endif endif -ifndef BUILD_CPP +ifndef BUILD_CXX ifdef CROSS_COMPILE_ARCH -BUILD_CPP = $(ALT_COMPILER_PATH)/g++$(GCC_SUFFIX) +BUILD_CXX = $(ALT_COMPILER_PATH)/g++ else -BUILD_CPP = g++ +BUILD_CXX = g++ endif endif -CPP = $(BUILD_CPP) +CXX = $(BUILD_CXX) CC = $(BUILD_GCC) -HOSTCPP = $(HOST_CPP) +HOSTCXX = $(HOST_CXX) HOSTCC = $(HOST_GCC) AS = $(CC) -c