# HG changeset patch
# User andrew
# Date 1335994552 -3600
# Node ID 5be91de8b779b6cf5a8236d4a2b51b5736da6852
# Parent  11f2ed4d21418f2fa9fc6cf520ff84b30c425c34
Make {HOST,BUILD}_{GCC,CPP} work again, post build-infra changes.  Rename {HOST_BUILD}_CPP to {HOST_BUILD}_CXX.

diff -r 11f2ed4d2141 -r 5be91de8b779 make/linux/makefiles/gcc.make
--- a/make/linux/makefiles/gcc.make	Wed May 02 15:07:20 2012 +0100
+++ b/make/linux/makefiles/gcc.make	Wed May 02 22:35:52 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