commit ec4caba79cf805a21a7d705cb35ecd89bb598a7f
author Ben Cheng <bccheng@google.com> Wed Dec 12 16:22:54 2012 -0800
committer Ben Cheng <bccheng@google.com> Thu Dec 13 10:43:55 2012 -0800
tree f10829bbdfba88a4c2642948eff8597f6a383066
parent e881cab16047fd31745dde210834c1ab7a41049d

Enable lunch command to pick up new toolchain version.

Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.

Change-Id: Icdacb8c46034b8a24a9875b7596b31d00861512a

core/combo/TARGET_linux-arm.mk

diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index 8be89c4..bc78174 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -34,8 +34,10 @@
 TARGET_ARCH_VARIANT := armv5te
 endif
 
-ifeq ($(strip $(TARGET_GCC_VERSION)),)
-TARGET_GCC_VERSION := 4.6
+ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
+TARGET_GCC_VERSION := 4.7
+else
+TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
 endif
 
 TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk