Don't force LLVM to be only built as 64-bit on the host.

We do need to force 64-bit if a host component is using libLLVM,
however, since we only have 64-bit prebuilts.

Change-Id: Iee0282973fc989e09c6811f5dff13a78c543bdda

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 28463b5..2f71710 100644 (file)
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -72,8 +72,11 @@ LOCAL_IS_HOST_MODULE := true
 ifeq ($(HOST_PREFER_32_BIT),true)
 LOCAL_MULTILIB := 32
 else
+ifeq (libLLVM, $(filter libLLVM,$(LOCAL_SHARED_LIBRARIES)$(LOCAL_SHARED_LIBRARIES_$(HOST_OS))))
+# Skip building a 32-bit shared object if they are using libLLVM.
 LOCAL_MULTILIB := first
 endif
+endif
 
 ###########################################################
 ## Commands for running tblgen to compile a td file