summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-05-06 17:53:31 -0700
committerStephen Hines <srhines@google.com>2014-05-06 17:53:31 -0700
commitc2e167a48f25a600b2f531a278144ab3953c0e2d (patch)
treede074dee14887d469a5b8090176c4906f96a52b7 /tools
parent7e3bc2d73a00a663afe78dbf4ff37374b05326d5 (diff)
downloadexternal_llvm-c2e167a48f25a600b2f531a278144ab3953c0e2d.zip
external_llvm-c2e167a48f25a600b2f531a278144ab3953c0e2d.tar.gz
external_llvm-c2e167a48f25a600b2f531a278144ab3953c0e2d.tar.bz2
We need to build the ARM components for AArch64 as well.
Bug: 14474874 Change-Id: I37d5a95db83c31bb77cf2e2b5686d8aa329fd7d8
Diffstat (limited to 'tools')
-rw-r--r--tools/llc/Android.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index 2167fe3..391ba39 100644
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -116,11 +116,12 @@ LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_SRC_FILES := $(llvm_llc_SRC_FILES)
LOCAL_C_INCLUDES += external/llvm/include
-LOCAL_STATIC_LIBRARIES_arm := $(llvm_llc_arm_STATIC_LIBRARIES)
-LOCAL_STATIC_LIBRARIES_mips := $(llvm_llc_mips_STATIC_LIBRARIES)
-LOCAL_STATIC_LIBRARIES_x86 := $(llvm_llc_x86_STATIC_LIBRARIES)
-LOCAL_STATIC_LIBRARIES_x86_64 := $(llvm_llc_x86_STATIC_LIBRARIES)
-LOCAL_STATIC_LIBRARIES_arm64 := $(llvm_llc_arm64_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES_arm += $(llvm_llc_arm_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES_mips += $(llvm_llc_mips_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES_x86 += $(llvm_llc_x86_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES_x86_64 += $(llvm_llc_x86_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_arm64_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_arm_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES += $(llvm_llc_STATIC_LIBRARIES)