Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 914f7fd9 authored by Ben Cheng's avatar Ben Cheng
Browse files

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
parent 98ce73b2

core/combo/TARGET_linux-arm.mk

+3 −1
Original line number Diff line number Diff line
@@ -34,8 +34,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) 
TARGET_ARCH_VARIANT := armv5te

endif



ifeq ($(strip $(TARGET_GCC_VERSION)),)

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

core/combo/TARGET_linux-mips.mk

+3 −1
Original line number Diff line number Diff line
@@ -34,8 +34,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) 
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

core/combo/TARGET_linux-x86.mk

+3 −1
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) 
TARGET_ARCH_VARIANT := x86

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



# Include the arch-variant-specific configuration file.