diff options
| author | Yabin Cui <yabinc@google.com> | 2015-09-21 20:13:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-21 20:13:07 +0000 |
| commit | 4916d35cffbdf04bc9115332c8af25ca2dfb1830 (patch) | |
| tree | d18aaf32e4f6deabcd5355de70ee9b63ea98f385 | |
| parent | efa1484ed464c3b0ec067ca6272437be8398ffab (diff) | |
| parent | b4cc08a8686b54ddcded456f8c319fc6872fa781 (diff) | |
| download | llvm-4916d35cffbdf04bc9115332c8af25ca2dfb1830.tar.gz | |
am b4cc08a8: am 722ce25e: Merge "Don\'t force LLVM to be only built as 64-bit on the host."
* commit 'b4cc08a8686b54ddcded456f8c319fc6872fa781':
Don't force LLVM to be only built as 64-bit on the host.
| -rw-r--r-- | llvm-host-build.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/llvm-host-build.mk b/llvm-host-build.mk index 28463b53ca73..2f7171019d6a 100644 --- 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 |