Link to archive versions of libraries instead of the relinked ones

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

diff --git a/tools/bugpoint/Makefile b/tools/bugpoint/Makefile
index e5eacd0cb1b31a6dca3bd9f88c002f4340330baf..fdb587ccea27ece4d106f3903f73c695869e3cbd 100644 (file)
--- a/tools/bugpoint/Makefile
+++ b/tools/bugpoint/Makefile
@@ -10,11 +10,11 @@ LEVEL = ../..
 
 TOOLNAME = bugpoint
 
-OPTLIBS  = LLVMTransforms LLVMInstrumentation LLVMProfilePaths
-ANALIBS  = LLVMDataStructure LLVMipa LLVMTarget.a 
+OPTLIBS  = LLVMTransforms.a LLVMInstrumentation.a LLVMProfilePaths
+ANALIBS  = LLVMDataStructure LLVMipa.a LLVMTarget.a 
 
-USEDLIBS = LLVMipo LLVMScalarOpts LLVMAnalysis $(OPTLIBS) $(ANALIBS) \
-          LLVMTransformUtils \
+USEDLIBS = LLVMipo.a LLVMScalarOpts.a $(OPTLIBS) $(ANALIBS) LLVMAnalysis.a \
+          LLVMTransformUtils.a \
           LLVMAsmParser LLVMLinker.a LLVMBCReader LLVMBCWriter \
           LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
 

diff --git a/tools/bugpoint/bugpoint.cpp b/tools/bugpoint/bugpoint.cpp
index a4442c7ef97c664245d669b638ed9f097d16c92f..0f25cf8a50675abb594ae2bd468f4f89f7c8c610 100644 (file)
--- a/tools/bugpoint/bugpoint.cpp
+++ b/tools/bugpoint/bugpoint.cpp
@@ -14,6 +14,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "BugDriver.h"
+#include "llvm/Analysis/LinkAllAnalyses.h"
+#include "llvm/Transforms/LinkAllPasses.h"
 #include "llvm/Support/PassNameParser.h"
 #include "llvm/Support/ToolRunner.h"
 #include "llvm/Support/CommandLine.h"