am 26f47aba: Merge "Switch to GCC 4.7 for X86 and MIPS"

* commit '26f47aba2d973bc1cc459a63df7bd0eec799f4ff':
  Switch to GCC 4.7 for X86 and MIPS
This commit is contained in:
Andrew Hsieh
2012-12-21 15:51:44 -08:00
committed by Android Git Automerger
2 changed files with 2 additions and 2 deletions

View File

@@ -35,7 +35,7 @@ TARGET_ARCH_VARIANT := mips32r2-fp
endif endif
ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
TARGET_GCC_VERSION := 4.6 TARGET_GCC_VERSION := 4.7
else else
TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif endif

View File

@@ -23,7 +23,7 @@ TARGET_ARCH_VARIANT := x86
endif endif
ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
TARGET_GCC_VERSION := 4.6 TARGET_GCC_VERSION := 4.7
else else
TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif endif