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

Commit 5ece4724 authored Dec 13, 2012 by Ben Cheng Committed by Gerrit Code Review Dec 13, 2012

Merge "Enable lunch command to pick up new toolchain version."

parents 98ce73b2 914f7fd9

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.