diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-04-20 16:43:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-20 16:43:23 -0700 |
| commit | c4aa4ff3551873c2e87a8679994d1f41f9909b0b (patch) | |
| tree | b1a6a0dd930f64d99e8b7246e521abbee553f47b | |
| parent | 9041aa50fbdb2cff512617a0377385c7d5ada663 (diff) | |
| parent | 810b0d8bb4a458c5a92c0bed48b75cbf27f1410d (diff) | |
| download | build-c4aa4ff3551873c2e87a8679994d1f41f9909b0b.zip build-c4aa4ff3551873c2e87a8679994d1f41f9909b0b.tar.gz build-c4aa4ff3551873c2e87a8679994d1f41f9909b0b.tar.bz2 | |
am 810b0d8b: Merge "Fix build problems with gcc-4.6.x."
* commit '810b0d8bb4a458c5a92c0bed48b75cbf27f1410d':
Fix build problems with gcc-4.6.x.
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 8c89143..784010c 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -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: |