diff options
| author | Ying Wang <wangying@google.com> | 2014-06-11 19:26:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 19:26:30 +0000 |
| commit | f7988507f48576d1455696693281b63d8ba7f478 (patch) | |
| tree | 44272e70b3889a2381b30ac976d0d081301cdf74 /core/clang | |
| parent | 80d3bd158270d53c2bfbb45c53160d2e89e87e1d (diff) | |
| parent | 2d19cbd279ed69c7202f089be174c35c1585f709 (diff) | |
| download | build-f7988507f48576d1455696693281b63d8ba7f478.zip build-f7988507f48576d1455696693281b63d8ba7f478.tar.gz build-f7988507f48576d1455696693281b63d8ba7f478.tar.bz2 | |
am 2d19cbd2: resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp
* commit '2d19cbd279ed69c7202f089be174c35c1585f709':
Switch to 32-bit-by-default host multilib build.
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/config.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk index c7ba15a..1125368 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -6,11 +6,6 @@ WITHOUT_TARGET_CLANG := true WITHOUT_HOST_CLANG := true endif -# We don't have 64-bit host prebuilts yet. -ifeq (true,$(HOST_IS_64_BIT)) -FORCE_BUILD_LLVM_COMPONENTS := true -endif - LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.5/bin LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.5/lib/clang/3.5/include/ |