p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Ben Cheng 2012-12-13 10:11:21 -08:00 committed by Gerrit Code Review
parent 98ce73b27a 914f7fd938
commit 5ece4724d1
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/combo/TARGET_linux-arm.mk
View File

@ -34,8 +34,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
TARGET_ARCH_VARIANT := armv5te TARGET_ARCH_VARIANT := armv5te
endif endif
ifeq ($(strip $(TARGET_GCC_VERSION)),) ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
TARGET_GCC_VERSION := 4.7 TARGET_GCC_VERSION := 4.7
else
TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif endif
TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk

4
core/combo/TARGET_linux-mips.mk
View File

@ -34,8 +34,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
TARGET_ARCH_VARIANT := mips32r2-fp TARGET_ARCH_VARIANT := mips32r2-fp
endif endif
ifeq ($(strip $(TARGET_GCC_VERSION)),) ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
TARGET_GCC_VERSION := 4.6 TARGET_GCC_VERSION := 4.6
else
TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif endif
TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk

4
core/combo/TARGET_linux-x86.mk
View File

@ -22,8 +22,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
TARGET_ARCH_VARIANT := x86 TARGET_ARCH_VARIANT := x86
endif endif
ifeq ($(strip $(TARGET_GCC_VERSION)),) ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
TARGET_GCC_VERSION := 4.6 TARGET_GCC_VERSION := 4.6
else
TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif endif
# Include the arch-variant-specific configuration file. # Include the arch-variant-specific configuration file.