Fix build problems with gcc-4.6.x.

Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
This commit is contained in:
Doug Kwan
2011-10-13 12:28:34 -07:00
parent df9a8ab186
commit 2b40757725

View File

@@ -114,11 +114,12 @@ TARGET_GLOBAL_CFLAGS += \
-include $(android_config_h) \
-I $(arch_include_dir)
# This warning causes dalvik not to build with gcc 4.6 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
# in gcc-4.4.x
ifneq ($(filter 4.6.0%, $(shell $(TARGET_CC) --version)),)
TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable
# 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)),)
TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin
endif
# This is to avoid the dreaded warning compiler message: