commit 9b0a76fdf18d9bcc870a07e9089edc368d16c9d5
author Ying Wang <wangying@google.com> Wed May 20 07:03:25 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 20 07:03:25 2015 +0000
tree f1cfefef8ff29f4d89ba68930317e2fa8c3c682d
parent 02026edf4d104750fde070862636d29db4124b3a
parent a6ffb929f44e8def03bdc820386c5acfbd78f24b

am a6ffb929: FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.

* commit 'a6ffb929f44e8def03bdc820386c5acfbd78f24b':
  FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.

core/clang/config.mk

diff --git a/core/clang/config.mk b/core/clang/config.mk
index 5b2aea5..2a2ce94 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -101,3 +101,8 @@
 # This allows us to use the superset of functionality that compiler-rt
 # provides to Clang (for supporting features like -ftrapv).
 COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler_rt-extras
+
+ifeq ($(HOST_PREFER_32_BIT),true)
+# We don't have 32-bit prebuilt libLLVM/libclang, so force to build them from source.
+FORCE_BUILD_LLVM_COMPONENTS := true
+endif