diff options
| author | Tim Murray <timmurray@google.com> | 2014-07-24 14:27:05 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2014-07-24 14:27:05 -0700 |
| commit | 72c70d14d41ca50e810af34c1977fa30f2d41567 (patch) | |
| tree | 19dcf021908c6356fdff992e7a57eaf557bd9458 /core/clang | |
| parent | e7b374485f222ae4b6110091ebba66ec33c857b5 (diff) | |
| parent | 2812b27c5f0926a01373347fd9947f4d1667d3ff (diff) | |
| download | build-72c70d14d41ca50e810af34c1977fa30f2d41567.zip build-72c70d14d41ca50e810af34c1977fa30f2d41567.tar.gz build-72c70d14d41ca50e810af34c1977fa30f2d41567.tar.bz2 | |
resolved conflicts for merge of 2812b27c to lmp-dev-plus-aosp
Change-Id: I770fbf16affbd43b0750b50426298038e4b573b7
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/HOST_x86.mk | 4 | ||||
| -rw-r--r-- | core/clang/HOST_x86_64.mk | 4 | ||||
| -rw-r--r-- | core/clang/HOST_x86_common.mk | 6 | ||||
| -rw-r--r-- | core/clang/config.mk | 3 |
4 files changed, 15 insertions, 2 deletions
diff --git a/core/clang/HOST_x86.mk b/core/clang/HOST_x86.mk index 510a74d..fb5cbf4 100644 --- a/core/clang/HOST_x86.mk +++ b/core/clang/HOST_x86.mk @@ -11,6 +11,10 @@ CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA endif ifeq ($(HOST_OS),darwin) CLANG_CONFIG_x86_HOST_TRIPLE := i686-apple-darwin +CLANG_CONFIG_x86_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS) +CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS) +CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CPPFLAGS) +CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_LDFLAGS) endif ifeq ($(HOST_OS),windows) CLANG_CONFIG_x86_HOST_TRIPLE := i686-pc-mingw32 diff --git a/core/clang/HOST_x86_64.mk b/core/clang/HOST_x86_64.mk index 6b94525..5f70678 100644 --- a/core/clang/HOST_x86_64.mk +++ b/core/clang/HOST_x86_64.mk @@ -11,6 +11,10 @@ CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EX endif ifeq ($(HOST_OS),darwin) CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-apple-darwin +CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS) +CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS) +CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CPPFLAGS) +CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_LDFLAGS) endif ifeq ($(HOST_OS),windows) CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-pc-mingw64 diff --git a/core/clang/HOST_x86_common.mk b/core/clang/HOST_x86_common.mk index 0241cb6..8820854 100644 --- a/core/clang/HOST_x86_common.mk +++ b/core/clang/HOST_x86_common.mk @@ -1,7 +1,11 @@ # Shared by HOST_x86.mk and HOST_x86_64.mk. ifeq ($(HOST_OS),darwin) -# nothing required here yet +CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS := \ + -integrated-as + +CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS := \ + -integrated-as endif ifeq ($(HOST_OS),linux) diff --git a/core/clang/config.mk b/core/clang/config.mk index 1de46f0..3f5be60 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -41,7 +41,8 @@ CLANG_CONFIG_UNKNOWN_CFLAGS := \ -Wmaybe-uninitialized \ -Wno-maybe-uninitialized \ -Wno-error=maybe-uninitialized \ - -fno-canonical-system-headers + -fno-canonical-system-headers \ + -Wno-unused-local-typedefs # Clang flags for all host rules CLANG_CONFIG_HOST_EXTRA_ASFLAGS := |