diff options
| author | Tim Murray <timmurray@google.com> | 2014-03-21 15:39:46 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2014-03-21 15:39:46 -0700 |
| commit | 7d8cea6e8e2bddaa4475835106bf88d214d95279 (patch) | |
| tree | f2db23f6b549f1d227cedb3f82f20edb205a94e7 | |
| parent | 4afc3292eec5c576c091dee244b92bc60f61f692 (diff) | |
| download | external_llvm-7d8cea6e8e2bddaa4475835106bf88d214d95279.zip external_llvm-7d8cea6e8e2bddaa4475835106bf88d214d95279.tar.gz external_llvm-7d8cea6e8e2bddaa4475835106bf88d214d95279.tar.bz2 | |
Make LLVM compile with prebuilt clang.
bug 13588226
Change-Id: I278371c48b8da811a4bdb1be99bfe6474b0d525a
| -rw-r--r-- | llvm-device-build.mk | 5 | ||||
| -rw-r--r-- | llvm-host-build.mk | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/llvm-device-build.mk b/llvm-device-build.mk index 70c9a84..7464c98 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) diff --git a/llvm-host-build.mk b/llvm-host-build.mk index afe6b4c..e8fd066 100644 --- a/llvm-host-build.mk +++ b/llvm-host-build.mk @@ -1,3 +1,5 @@ +LOCAL_CLANG := true + LOCAL_CFLAGS := \ -D_GNU_SOURCE \ -D__STDC_LIMIT_MACROS \ @@ -7,6 +9,7 @@ LOCAL_CFLAGS := \ -W \ -Wno-unused-parameter \ -Wwrite-strings \ + -Dsprintf=sprintf \ $(LOCAL_CFLAGS) ifeq ($(LLVM_ENABLE_ASSERTION),true) |