StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add pattern to check for GCC 4.6"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2012-08-28 12:47:34 -07:00
committed by android code review
parent 1d0f5f914a 26c7805781
commit 9eb87b8d20
2 changed files with 2 additions and 2 deletions
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 += \
# We cannot turn it off blindly since the option is not available # 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 # in gcc-4.4.x. We also want to disable sincos optimization globally
# by turning off the builtin sin function. # 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 \ TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin \
-fno-strict-volatile-bitfields -fno-strict-volatile-bitfields
endif 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. # 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 # We cannot turn it off blindly since the option is not available
# in gcc-4.4.x. # 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 \ TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable \
-fno-strict-volatile-bitfields -fno-strict-volatile-bitfields
endif endif