diff options
| author | Rong Xu <xur@google.com> | 2014-12-05 19:24:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 19:24:18 +0000 |
| commit | 69b8c4f9314e6c48dde64a234b2f4b25500abb36 (patch) | |
| tree | 194e8357df8e9e2c05b92f034d79d506c8d0e604 | |
| parent | 89b56de1904a2f72e81390d6758162dec6797bb9 (diff) | |
| parent | 37979c5749bfa516094080f9e8a5c0f387273c5b (diff) | |
| download | build-69b8c4f9314e6c48dde64a234b2f4b25500abb36.zip build-69b8c4f9314e6c48dde64a234b2f4b25500abb36.tar.gz build-69b8c4f9314e6c48dde64a234b2f4b25500abb36.tar.bz2 | |
am 37979c57: Merge "Upgrade gcc compiler for arm build from 4.8 to 4.9"
* commit '37979c5749bfa516094080f9e8a5c0f387273c5b':
Upgrade gcc compiler for arm build from 4.8 to 4.9
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 9ffcb86..c1f3665 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -35,10 +35,10 @@ TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv5te endif # Decouple NDK library selection with platform compiler version -$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.8 +$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9 ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) -$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8 +$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9 else $(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif @@ -114,7 +114,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ # "-Wall -Werror" due to a commom idiom "ALOGV(mesg)" where ALOGV is turned # into no-op in some builds while mesg is defined earlier. So we explicitly # disable "-Wunused-but-set-variable" here. -ifneq ($(filter 4.6 4.6.% 4.7 4.7.% 4.8, $($(combo_2nd_arch_prefix)TARGET_GCC_VERSION)),) +ifneq ($(filter 4.6 4.6.% 4.7 4.7.% 4.8 4.9, $($(combo_2nd_arch_prefix)TARGET_GCC_VERSION)),) $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -fno-builtin-sin \ -fno-strict-volatile-bitfields endif |