From: petr000 <silhavik.p@gmail.com>
Date: Sun, 17 Apr 2011 09:04:08 +0000 (+0200)
Subject: Removed useless HeaderSearch and moved the ResourceDir to the Driver.
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/boost-statechart-viewer.git/commitdiff_plain/f01a7d6f51942433d5b363c64e4ea27c75ccfd8d

Removed useless HeaderSearch and moved the ResourceDir to the Driver.
---

diff --git a/src/visualizer.cpp b/src/visualizer.cpp
index b2e6fcc..57b17cc 100644
--- a/src/visualizer.cpp
+++ b/src/visualizer.cpp
@@ -436,9 +436,11 @@ int main(int argc, char **argv)
 	SourceManager sm (diag, fm);
 	HeaderSearch *headers = new HeaderSearch(fm);
 	
-	Driver TheDriver(LLVM_PREFIX "/bin", llvm::sys::getHostTriple(), "", false, false, diag);
+	Driver TheDriver(LLVM_BINDIR, llvm::sys::getHostTriple(), "", false, false, diag);
 	TheDriver.setCheckInputsExist(true);
 	TheDriver.CCCIsCXX = 1;	
+	TheDriver.ResourceDir = LLVM_PREFIX "/lib/clang/" CLANG_VERSION_STRING;
+
 	CompilerInvocation compInv;
 	llvm::SmallVector<const char *, 16> Args(argv, argv + argc);
 	llvm::OwningPtr<Compilation> C(TheDriver.BuildCompilation(Args.size(),
@@ -466,11 +468,9 @@ int main(int argc, char **argv)
 	                                  diag);
 
 	HeaderSearchOptions hsopts = compInv.getHeaderSearchOpts();
-	hsopts.ResourceDir = LLVM_PREFIX "/lib/clang/" CLANG_VERSION_STRING;
 	LangOptions lang = compInv.getLangOpts();
 	CompilerInvocation::setLangDefaults(lang, IK_ObjCXX);
 	TargetInfo *ti = TargetInfo::CreateTargetInfo(diag, compInv.getTargetOpts());
-	ApplyHeaderSearchOptions(*headers, hsopts, lang, ti->getTriple());
 	FrontendOptions f = compInv.getFrontendOpts();
 	inputFilename = f.Inputs[0].second;