diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 4 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 4 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 4 | ||||
| -rw-r--r-- | core/config.mk | 5 |
4 files changed, 12 insertions, 5 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index dd7a8f0..8be89c4 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -34,6 +34,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) TARGET_ARCH_VARIANT := armv5te endif +ifeq ($(strip $(TARGET_GCC_VERSION)),) +TARGET_GCC_VERSION := 4.6 +endif + TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) $(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT)) diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index 6e9cd01..dc28018 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -34,6 +34,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) TARGET_ARCH_VARIANT := mips32r2-fp endif +ifeq ($(strip $(TARGET_GCC_VERSION)),) +TARGET_GCC_VERSION := 4.6 +endif + TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) $(error Unknown MIPS architecture variant: $(TARGET_ARCH_VARIANT)) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 948ee17..187e2c2 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -22,6 +22,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) TARGET_ARCH_VARIANT := x86 endif +ifeq ($(strip $(TARGET_GCC_VERSION)),) +TARGET_GCC_VERSION := 4.6 +endif + # Include the arch-variant-specific configuration file. # Its role is to define various ARCH_X86_HAVE_XXX feature macros, # plus initial values for TARGET_GLOBAL_CFLAGS diff --git a/core/config.mk b/core/config.mk index 1af5a2a..747d8ed 100644 --- a/core/config.mk +++ b/core/config.mk @@ -225,11 +225,6 @@ ifeq ($(TARGET_CPU_ABI),) endif TARGET_CPU_ABI2 := $(strip $(TARGET_CPU_ABI2)) -# default target GCC version -ifeq ($(strip $(TARGET_GCC_VERSION)),) -TARGET_GCC_VERSION := 4.6 -endif - # $(1): os/arch define select-android-config-h build/core/combo/include/arch/$(1)/AndroidConfig.h |