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

am 810b0d8b: Merge "Fix build problems with gcc-4.6.x."

Browse source 
* commit '810b0d8bb4a458c5a92c0bed48b75cbf27f1410d':
  Fix build problems with gcc-4.6.x.
This commit is contained in:
Jean-Baptiste Queru 2012-04-20 16:43:23 -07:00 committed by Android Git Automerger
commit c4aa4ff355
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) \ -include $(android_config_h) \
-I $(arch_include_dir) -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 # We cannot turn it off blindly since the option is not available
# in gcc-4.4.x # in gcc-4.4.x. We also want to disable sincos optimization globally
ifneq ($(filter 4.6.0%, $(shell $(TARGET_CC) --version)),) # by turning off the builtin sin function.
TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable ifneq ($(filter 4.6.%, $(shell $(TARGET_CC) --version)),)
TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin
endif endif
# This is to avoid the dreaded warning compiler message: # This is to avoid the dreaded warning compiler message: