aboutsummaryrefslogtreecommitdiffstats
path: root/shared_llvm.mk
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-10-15 23:58:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-15 23:58:22 +0000
commit174cfc0e722b8cfd4887564e6c2d827e7e8764ba (patch)
treed6c08c7e169ceea993e6e16ff01abbf0ba72c3ba /shared_llvm.mk
parent41aed678bf944bd24d46360ef4a3c7eb207ecbf0 (diff)
parentb86aaa733ce2042447857baf096ccc58b4ec430a (diff)
downloadexternal_llvm-174cfc0e722b8cfd4887564e6c2d827e7e8764ba.zip
external_llvm-174cfc0e722b8cfd4887564e6c2d827e7e8764ba.tar.gz
external_llvm-174cfc0e722b8cfd4887564e6c2d827e7e8764ba.tar.bz2
am b86aaa73: add ARM codegen for x86 LLVM if specified
* commit 'b86aaa733ce2042447857baf096ccc58b4ec430a': add ARM codegen for x86 LLVM if specified
Diffstat (limited to 'shared_llvm.mk')
-rw-r--r--shared_llvm.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk
index 92e9f98..9a679bf 100644
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -123,6 +123,11 @@ LOCAL_WHOLE_STATIC_LIBRARIES_mips64 += $(llvm_mips_static_libraries)
LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_aarch64_static_libraries)
LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_arm_static_libraries)
+ifeq ($(BUILD_ARM_FOR_X86),true)
+LOCAL_WHOLE_STATIC_LIBRARIES_x86 += $(llvm_arm_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_arm_static_libraries)
+endif
+
LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries)
#LOCAL_LDLIBS := -ldl -lpthread