commit 914f7fd938ed8b1a9abcea57325010d464cdc55e
author Ben Cheng <bccheng@google.com> Wed Dec 12 16:22:54 2012 -0800
committer Ben Cheng <bccheng@google.com> Wed Dec 12 21:56:58 2012 -0800
tree 0a7c637270e369bf630c0680487cf70d95ee02d6
parent 98ce73b27a9df7795cc91ea9ca5781d3255828c7

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: I13b9cca2d288f7ab09104c57e7cad9f23de2548a

core/combo/TARGET_linux-mips.mk

diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index dc28018..c549af9 100644
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -34,8 +34,10 @@
 TARGET_ARCH_VARIANT := mips32r2-fp
 endif
 
-ifeq ($(strip $(TARGET_GCC_VERSION)),)
+ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
 TARGET_GCC_VERSION := 4.6
+else
+TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
 endif
 
 TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk