diff options
| author | Stephen Hines <srhines@google.com> | 2014-05-07 00:56:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-07 00:56:07 +0000 |
| commit | 220b921aed042f9e520c26cffd8282a94c66c3d5 (patch) | |
| tree | c65722e89f1b979189babb97df5577f740d05ea1 /tools | |
| parent | a15b2316e7c7871d79475302d650167692f15657 (diff) | |
| parent | c2e167a48f25a600b2f531a278144ab3953c0e2d (diff) | |
| download | external_llvm-220b921aed042f9e520c26cffd8282a94c66c3d5.zip external_llvm-220b921aed042f9e520c26cffd8282a94c66c3d5.tar.gz external_llvm-220b921aed042f9e520c26cffd8282a94c66c3d5.tar.bz2 | |
Merge "We need to build the ARM components for AArch64 as well."
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/llc/Android.mk | 11 |
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) |