diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-25 01:23:30 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-07-25 01:25:23 -0700 |
| commit | 9cc1fddf0cebbde07241416c8d01cfb198e40218 (patch) | |
| tree | 08d26d834c53b299e04caf7240445f9da0931cee /tools | |
| parent | c4c1f81ae1b07138df50e0459631abf3082bda9c (diff) | |
| download | external_llvm-9cc1fddf0cebbde07241416c8d01cfb198e40218.zip external_llvm-9cc1fddf0cebbde07241416c8d01cfb198e40218.tar.gz external_llvm-9cc1fddf0cebbde07241416c8d01cfb198e40218.tar.bz2 | |
Fix build of llvm-ar.
Bug: 15433215
llvm-ar was accidentally including static libraries and libLLVM dynamically,
leading to redefined options.
Change-Id: If1f05ff68a3c88580b9ff1981937e8d2cf99ee02
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/llvm-ar/Android.mk | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/tools/llvm-ar/Android.mk b/tools/llvm-ar/Android.mk index 23cd857..cc0979e 100644 --- a/tools/llvm-ar/Android.mk +++ b/tools/llvm-ar/Android.mk @@ -10,59 +10,6 @@ LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. llvm_ar_SRC_FILES := \ llvm-ar.cpp -llvm_ar_STATIC_LIBRARIES := \ - libLLVMObject \ - libLLVMBitReader \ - libLLVMCore \ - libLLVMSupport \ - -# libLLVMAArch64CodeGen \ - libLLVMAArch64Info \ - libLLVMAArch64Desc \ - libLLVMAArch64AsmParser \ - libLLVMAArch64AsmPrinter \ - libLLVMAArch64Disassembler \ - libLLVMARMCodeGen \ - libLLVMARMInfo \ - libLLVMARMDesc \ - libLLVMARMAsmParser \ - libLLVMARMAsmPrinter \ - libLLVMARMDisassembler \ - libLLVMMipsCodeGen \ - libLLVMMipsInfo \ - libLLVMMipsDesc \ - libLLVMMipsAsmParser \ - libLLVMMipsAsmPrinter \ - libLLVMMipsDisassembler \ - libLLVMX86CodeGen \ - libLLVMX86Info \ - libLLVMX86Desc \ - libLLVMX86AsmParser \ - libLLVMX86AsmPrinter \ - libLLVMX86Disassembler \ - libLLVMAsmPrinter \ - libLLVMSelectionDAG \ - libLLVMCodeGen \ - libLLVMObject \ - libLLVMScalarOpts \ - libLLVMInstCombine \ - libLLVMInstrumentation \ - libLLVMTransformObjCARC \ - libLLVMTransformUtils \ - libLLVMipa \ - libLLVMAnalysis \ - libLLVMTarget \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMCore \ - libLLVMAsmParser \ - libLLVMOption \ - libLLVMSupport \ - libLLVMVectorize \ - - - - include $(CLEAR_VARS) LOCAL_MODULE := llvm-ar @@ -72,7 +19,6 @@ LOCAL_IS_HOST_MODULE := true LOCAL_SRC_FILES := $(llvm_ar_SRC_FILES) -LOCAL_STATIC_LIBRARIES := $(llvm_ar_STATIC_LIBRARIES) LOCAL_SHARED_LIBRARIES := libLLVM LOCAL_LDLIBS += -lpthread -lm -ldl |