diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-10-23 17:29:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 17:29:45 -0700 |
| commit | a5b28e2d9236ab48d2638a98f460d184638d92aa (patch) | |
| tree | 800c02177561d0f8054ad4562caed960845e766c /core/combo/TARGET_linux-arm.mk | |
| parent | c7eda3e964128a9574a28f4986f239a5fe825dc2 (diff) | |
| parent | 267b07b2aafede64d212402c3554fc2888821c98 (diff) | |
| download | build-a5b28e2d9236ab48d2638a98f460d184638d92aa.zip build-a5b28e2d9236ab48d2638a98f460d184638d92aa.tar.gz build-a5b28e2d9236ab48d2638a98f460d184638d92aa.tar.bz2 | |
am 267b07b2: am 7176e801: Merge "Add TARGET_GCC_VERSION"
* commit '267b07b2aafede64d212402c3554fc2888821c98':
Add TARGET_GCC_VERSION
Diffstat (limited to 'core/combo/TARGET_linux-arm.mk')
| -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 4aa8576..eae2ac6 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -43,7 +43,7 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE) # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) -TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6 +TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-$(TARGET_GCC_VERSION) TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/arm-linux-androideabi- endif @@ -114,11 +114,11 @@ android_config_h := $(call select-android-config-h,linux-arm) TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h)) TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS) -# This warning causes dalvik not to build with gcc 4.6.x and -Werror. +# This warning causes dalvik not to build with gcc 4.6+ and -Werror. # We cannot turn it off blindly since the option is not available # in gcc-4.4.x. We also want to disable sincos optimization globally # by turning off the builtin sin function. -ifneq ($(filter 4.6 4.6.%, $(shell $(TARGET_CC) --version)),) +ifneq ($(filter 4.6 4.6.% 4.7 4.7.%, $(shell $(TARGET_CC) --version)),) TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin \ -fno-strict-volatile-bitfields endif |