diff options
author | Colin Cross <ccross@android.com> | 2015-04-07 15:05:50 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2015-04-07 15:05:50 -0700 |
commit | 62e6deb6547e82c80cf84385ffb9339bb6b09e6f (patch) | |
tree | 9a10cffabae8690c67f4b9b5e2917122bd340253 | |
parent | beed47390a60f6f0c77532b3d3f76bb47ef49423 (diff) | |
download | external_llvm-62e6deb6547e82c80cf84385ffb9339bb6b09e6f.zip external_llvm-62e6deb6547e82c80cf84385ffb9339bb6b09e6f.tar.gz external_llvm-62e6deb6547e82c80cf84385ffb9339bb6b09e6f.tar.bz2 |
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
-rw-r--r-- | llvm-host-build.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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 ########################################################### |