tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* commit '4dc6ed96a0612d4693cca5ed5674873754bcb37e':
  Add pattern to check for GCC 4.6
This commit is contained in:
Jean-Baptiste Queru 2012-08-28 13:41:09 -07:00 committed by Android Git Automerger
commit d4ace13802
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -118,7 +118,7 @@ TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_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

@ -95,7 +95,7 @@ TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_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