Use archive libraries instead of object files for VMCore, BCReader,

[oota-llvm.git] / tools / llc / Makefile

diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index c4af6d806a34d3a79354f5c715e5c4e1d75b0613..fe744039636ded64f010dc6593bc470efac14c43 100644 (file)
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -20,24 +20,13 @@ USEDLIBS :=
 
 # Check for LLVMCBackend  target
 ifneq ($(strip $(filter CBackend,$(TARGETS_TO_BUILD))),)
-USEDLIB += LLVMCBackend
+USEDLIBS += LLVMCBackend
 endif
 
-# Check for Skeleton target
-ifneq ($(strip $(filter Skeleton,$(TARGETS_TO_BUILD))),)
-USEDLIB += LLVMSkeleton
+ifneq ($(strip $(filter Sparc,$(TARGETS_TO_BUILD))),)
+USEDLIBS += LLVMSparc
 endif
 
-# Check for Sparc target
-ifneq ($(strip $(filter SparcV8,$(TARGETS_TO_BUILD))),)
-USEDLIBS += \
-       LLVMSparcV9ModuloSched \
-       LLVMSparcV8 \
-       LLVMSparcV9 \
-       LLVMSparcV9RegAlloc \
-       LLVMSparcV9InstrSched \
-       LLVMSparcV9LiveVar
-endif
 
 #Check for X86 Target
 ifneq ($(strip $(filter X86,$(TARGETS_TO_BUILD))),)
@@ -59,20 +48,25 @@ ifneq ($(strip $(filter IA64,$(TARGETS_TO_BUILD))),)
 USEDLIBS += LLVMIA64
 endif
 
+#Check for ARM Target
+ifneq ($(strip $(filter ARM,$(TARGETS_TO_BUILD))),)
+USEDLIBS += LLVMARM
+endif
+
 USEDLIBS += \
        LLVMSelectionDAG \
        LLVMCodeGen \
-       LLVMTarget.a \
+       LLVMTarget \
        LLVMipa.a \
        LLVMTransforms.a \
-       LLVMScalarOpts \
-       LLVMAnalysis.a \
+       LLVMScalarOpts.a \
        LLVMTransformUtils.a \
-       LLVMBCReader \
-       LLVMBCWriter \
-       LLVMCore \
+       LLVMAnalysis.a \
+       LLVMBCReader.a \
+       LLVMBCWriter.a \
+       LLVMCore.a \
        LLVMSupport.a \
-       LLVMbzip2 \
+       LLVMbzip2.a \
        LLVMSystem.a
 
 include $(LLVM_SRC_ROOT)/Makefile.rules