diff options
| author | Stephen Hines <srhines@google.com> | 2014-04-23 16:57:46 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-04-24 15:53:16 -0700 |
| commit | 36b56886974eae4f9c5ebc96befd3e7bfe5de338 (patch) | |
| tree | e6cfb69fbbd937f450eeb83bfb83b9da3b01275a /llvm-device-build.mk | |
| parent | 69a8640022b04415ae9fac62f8ab090601d8f889 (diff) | |
| download | external_llvm-36b56886974eae4f9c5ebc96befd3e7bfe5de338.zip external_llvm-36b56886974eae4f9c5ebc96befd3e7bfe5de338.tar.gz external_llvm-36b56886974eae4f9c5ebc96befd3e7bfe5de338.tar.bz2 | |
Update to LLVM 3.5a.
Change-Id: Ifadecab779f128e62e430c2b4f6ddd84953ed617
Diffstat (limited to 'llvm-device-build.mk')
| -rw-r--r-- | llvm-device-build.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/llvm-device-build.mk b/llvm-device-build.mk index 70c9a84..107762a 100644 --- a/llvm-device-build.mk +++ b/llvm-device-build.mk @@ -1,5 +1,7 @@ LOCAL_MODULE_TARGET_ARCH := $(LLVM_SUPPORTED_ARCH) +LOCAL_CLANG := true + LOCAL_CFLAGS := \ -D_GNU_SOURCE \ -D__STDC_LIMIT_MACROS \ @@ -11,15 +13,14 @@ LOCAL_CFLAGS := \ -W \ -Wno-unused-parameter \ -Wwrite-strings \ + -Dsprintf=sprintf \ $(LOCAL_CFLAGS) # The three inline options together reduce libbcc.so almost 1MB. # We move them from global build/core/combo/TARGET_linux-arm.mk # to here. LOCAL_CFLAGS := -DANDROID_TARGET_BUILD \ - -finline-limit=64 \ -finline-functions \ - -fno-inline-functions-called-once \ $(LOCAL_CFLAGS) ifeq ($(TARGET_BUILD_VARIANT),eng) @@ -51,12 +52,13 @@ endif LOCAL_CPPFLAGS := \ $(LOCAL_CPPFLAGS) \ -Woverloaded-virtual \ - -Wno-sign-promo + -Wno-sign-promo \ + -std=c++11 # Make sure bionic is first so we can include system headers. LOCAL_C_INCLUDES := \ bionic \ - external/stlport/stlport \ + external/libcxx/include \ $(LLVM_ROOT_PATH) \ $(LLVM_ROOT_PATH)/include \ $(LLVM_ROOT_PATH)/device/include \ |