From 62e6deb6547e82c80cf84385ffb9339bb6b09e6f Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 7 Apr 2015 15:05:50 -0700 Subject: Set LOCAL_MULTLIB := first for all LLVM host builds The default multlib setting for host libraries is going to change from "both" to "first". This breaks LLVM host compiles on 64-bit when FORCE_BUILD_LLVM_COMPONENTS, because LLVMHello tries to compile for both 64-bit and 32-bit, the 32-bit version tries to link against 32-bit libLLVM, but prebuilts/sdk/tools/* only provides a 64-bit version of libLLVM.so. When compiling for a 32-bit host we always set FORCE_BUILD_LLVM_COMPONENTS=true, so the easy fix is to force 64-bit host builds to only build LLVM components for 64-bit by setting LOCAL_MULTILIB := first in llvm-host-build.mk. Change-Id: Ia17c045649b59b90bdc06d4cbe03f2542bf42371 --- llvm-host-build.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/llvm-host-build.mk b/llvm-host-build.mk index 0b6bc07..74e14ba 100644 --- a/llvm-host-build.mk +++ b/llvm-host-build.mk @@ -58,6 +58,8 @@ endif LOCAL_IS_HOST_MODULE := true +LOCAL_MULTILIB := first + ########################################################### ## Commands for running tblgen to compile a td file ########################################################### -- cgit v1.1