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

am 9eb87b8d: Merge "Add pattern to check for GCC 4.6" 

* commit '9eb87b8d2011e65462ea42de6899158cd35a492a':
  Add pattern to check for GCC 4.6
This commit is contained in:
Jean-Baptiste Queru 2012-08-28 13:16:59 -07:00 committed by Android Git Automerger
parent fe95bc0fd6 9eb87b8d20
commit 4dc6ed96a0
2 changed files with 2 additions and 2 deletions

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

@ -118,7 +118,7 @@ TARGET_GLOBAL_CFLAGS += \
# 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.%, $(shell $(TARGET_CC) --version)),)
ifneq ($(filter 4.6 4.6.%, $(shell $(TARGET_CC) --version)),)
TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin \
-fno-strict-volatile-bitfields
endif

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

@ -96,7 +96,7 @@ TARGET_GLOBAL_CFLAGS += \
# This warning causes dalvik not to build with gcc 4.6.x and -Werror.
# We cannot turn it off blindly since the option is not available
# in gcc-4.4.x.
ifneq ($(filter 4.6.%, $(shell $(TARGET_CC) --version)),)
ifneq ($(filter 4.6 4.6.%, $(shell $(TARGET_CC) --version)),)
TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable \
-fno-strict-volatile-bitfields
endif