diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-04-20 08:30:04 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-04-20 08:30:05 -0700 |
| commit | 810b0d8bb4a458c5a92c0bed48b75cbf27f1410d (patch) | |
| tree | b0931bc8cc78c1e0dd5bab8bc561f2abe456cae2 | |
| parent | f04ee373123fab58dfd3adc06966cfe127abf6a6 (diff) | |
| parent | 422a3650d37730a5c793e52e3e6c815278753d22 (diff) | |
| download | build-810b0d8bb4a458c5a92c0bed48b75cbf27f1410d.zip build-810b0d8bb4a458c5a92c0bed48b75cbf27f1410d.tar.gz build-810b0d8bb4a458c5a92c0bed48b75cbf27f1410d.tar.bz2 | |
Merge "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: |