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

Merge "Fix build problems with gcc-4.6.x."

This commit is contained in:
Jean-Baptiste Queru 2012-04-20 08:30:04 -07:00 committed by android code review
parent f04ee37312 422a3650d3
commit 810b0d8bb4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/combo/TARGET_linux-arm.mk
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: