Fix MacOSX build failures. (pr841)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29246 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index 4de9228da6cb0c823e9bd8bb23cc224a88a0ae88..911bc36b57d5c1b610e0f2a54a0a675b09d704a9 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -609,7 +609,8 @@ ifeq ($(LLVMLIBS),JIT)
 Link += -dlopen self
 
 # Generic JIT libraries
-JIT_LIBS := LLVMInterpreter LLVMJIT LLVMCodeGen.a LLVMExecutionEngine
+JIT_LIBS := LLVMInterpreter LLVMJIT LLVMSelectionDAG.a LLVMCodeGen.a \
+            LLVMExecutionEngine
 
 # You can enable the X86 JIT on a non-X86 host by setting the flag
 # ENABLE_X86_JIT on the make command line. If not, it will still be
@@ -620,7 +621,7 @@ endif
 
 # What the X86 JIT requires
 ifdef ENABLE_X86_JIT
-  JIT_LIBS += LLVMX86 LLVMSelectionDAG.a
+  JIT_LIBS += LLVMX86 
 endif
 
 # You can enable the PowerPC JIT on a non-PowerPC host by setting the flag
@@ -632,7 +633,7 @@ endif
 
 # What the PowerPC JIT requires
 ifdef ENABLE_PPC_JIT
-  JIT_LIBS += LLVMPowerPC LLVMSelectionDAG.a
+  JIT_LIBS += LLVMPowerPC 
 endif
 
 # You can enable the Alpha JIT on a non-Alpha host by setting the flag
@@ -644,7 +645,7 @@ endif
 
 # What the Alpha JIT requires
 ifdef ENABLE_ALPHA_JIT
-  JIT_LIBS += LLVMAlpha LLVMSelectionDAG.a
+  JIT_LIBS += LLVMAlpha 
 endif
 
 LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts.a LLVMTransformUtils.a LLVMAnalysis.a \

diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index 7bef4f2751f4075777ca8db7b0f1113a31d40239..d20c307c4606dbb07f525903d706b68e6e02980c 100644 (file)
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -55,8 +55,8 @@ USEDLIBS += LLVMARM
 endif
 
 USEDLIBS += \
-       LLVMSelectionDAG.a \
        LLVMCodeGen.a \
+       LLVMSelectionDAG.a \
        LLVMTarget.a \
        LLVMipa.a \
        LLVMTransforms.a \