summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2015-04-09 01:15:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-09 01:15:16 +0000
commit0eb46f5d1e06a4284663d636a74b06adc3a161d7 (patch)
treef276f9648a7d7687ef34d69eeb2c60438d58e4e3
parent8fa729b527c076d9b53b8c25d5c500109ff1c942 (diff)
parentc75239e6119d0f9a74c57099d91cbc9bde56bf33 (diff)
downloadexternal_llvm-0eb46f5d1e06a4284663d636a74b06adc3a161d7.zip
external_llvm-0eb46f5d1e06a4284663d636a74b06adc3a161d7.tar.gz
external_llvm-0eb46f5d1e06a4284663d636a74b06adc3a161d7.tar.bz2
am c75239e6: Merge "Take HOST_PREFER_32_BIT into account"
* commit 'c75239e6119d0f9a74c57099d91cbc9bde56bf33': Take HOST_PREFER_32_BIT into account
-rw-r--r--llvm-host-build.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 74e14ba..d2c7e52 100644
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -58,7 +58,11 @@ endif
LOCAL_IS_HOST_MODULE := true
+ifeq ($(HOST_PREFER_32_BIT),true)
+LOCAL_MULTILIB := 32
+else
LOCAL_MULTILIB := first
+endif
###########################################################
## Commands for running tblgen to compile a td file