From 02b04b4d347b537becdf8453c511bf058fa4389a Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Fri, 21 Jul 2006 00:10:47 +0000
Subject: [PATCH] Build more debugger/selectiondag libraries as archives
 instead of .o files. This works around bugs in some versions of the cygwin
 linker.

Patch contributed by Anton Korobeynikov.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29239 91177308-0d34-0410-b5e6-96231b3b80d8
---
 Makefile.rules                    | 6 +++---
 lib/CodeGen/SelectionDAG/Makefile | 1 +
 lib/Debugger/Makefile             | 1 +
 tools/llc/Makefile                | 2 +-
 tools/llvm-db/Makefile            | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile.rules b/Makefile.rules
index bc938d1ab19..4de9228da6c 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -620,7 +620,7 @@ endif
 
 # What the X86 JIT requires
 ifdef ENABLE_X86_JIT
-  JIT_LIBS += LLVMX86 LLVMSelectionDAG
+  JIT_LIBS += LLVMX86 LLVMSelectionDAG.a
 endif
 
 # You can enable the PowerPC JIT on a non-PowerPC host by setting the flag
@@ -632,7 +632,7 @@ endif
 
 # What the PowerPC JIT requires
 ifdef ENABLE_PPC_JIT
-  JIT_LIBS += LLVMPowerPC LLVMSelectionDAG
+  JIT_LIBS += LLVMPowerPC LLVMSelectionDAG.a
 endif
 
 # You can enable the Alpha JIT on a non-Alpha host by setting the flag
@@ -644,7 +644,7 @@ endif
 
 # What the Alpha JIT requires
 ifdef ENABLE_ALPHA_JIT
-  JIT_LIBS += LLVMAlpha LLVMSelectionDAG
+  JIT_LIBS += LLVMAlpha LLVMSelectionDAG.a
 endif
 
 LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts.a LLVMTransformUtils.a LLVMAnalysis.a \
diff --git a/lib/CodeGen/SelectionDAG/Makefile b/lib/CodeGen/SelectionDAG/Makefile
index 73d9edb9908..306a6caad5d 100644
--- a/lib/CodeGen/SelectionDAG/Makefile
+++ b/lib/CodeGen/SelectionDAG/Makefile
@@ -9,5 +9,6 @@
 LEVEL = ../../..
 LIBRARYNAME = LLVMSelectionDAG
 PARALLEL_DIRS =
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
diff --git a/lib/Debugger/Makefile b/lib/Debugger/Makefile
index 70ee46edefc..c3220648387 100644
--- a/lib/Debugger/Makefile
+++ b/lib/Debugger/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../..
 LIBRARYNAME = LLVMDebugger
 EXTRA_DIST = README.txt
 REQUIRES_EH := 1
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index 84689cf7183..7bef4f2751f 100644
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -55,7 +55,7 @@ USEDLIBS += LLVMARM
 endif
 
 USEDLIBS += \
-	LLVMSelectionDAG \
+	LLVMSelectionDAG.a \
 	LLVMCodeGen.a \
 	LLVMTarget.a \
 	LLVMipa.a \
diff --git a/tools/llvm-db/Makefile b/tools/llvm-db/Makefile
index e7bc95fa5da..3bf9d54afd2 100644
--- a/tools/llvm-db/Makefile
+++ b/tools/llvm-db/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../..
 TOOLNAME = llvm-db
-USEDLIBS = LLVMDebugger LLVMBCReader.a LLVMCore.a LLVMSupport.a \
+USEDLIBS = LLVMDebugger.a LLVMBCReader.a LLVMCore.a LLVMSupport.a \
 	  LLVMbzip2.a LLVMSystem.a
 REQUIRES_EH := 1