commit a69e59623b25bf53d07f044db12c7ad9e3635c06
author Ying Wang <wangying@google.com> Fri Nov 07 00:58:32 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 07 00:58:32 2014 +0000
tree 31e96dc545da6a0f88f2c9bd1bc4e7157cf36a05
parent 1cffe219790a316ba36ef2495867d7b306b0f861
parent 478eda5365f866c830f957d6bd1aba3854d55bcc

am 478eda53: Merge "FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT."

* commit '478eda5365f866c830f957d6bd1aba3854d55bcc':
  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 3f56359..b102afc 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -113,3 +113,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