intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-24 08:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Driver: Lift clang resource directory computation to the Driver object.

Browse Source 
llvm-svn: 93971
This commit is contained in:
Daniel Dunbar
2010-01-20 02:35:16 +00:00
parent e2b661c26c
commit 3f3e2cd820
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
clang/include/clang/Driver/Driver.h
View File

@@ -61,6 +61,9 @@ public:
/// command line.
std::string Dir;
/// The path to the compiler resource directory.
std::string ResourceDir;
/// Default host triple.
std::string DefaultHostTriple;

8
clang/lib/Driver/Driver.cpp
View File

@@ -67,6 +67,14 @@ Driver::Driver(llvm::StringRef _Name, llvm::StringRef _Dir,
CCCUseClangCXX = false;
}
// Compute the path to the resource directory.
llvm::sys::Path P(Dir);
P.eraseComponent(); // Remove /bin from foo/bin
P.appendComponent("lib");
P.appendComponent("clang");
P.appendComponent(CLANG_VERSION_STRING);
ResourceDir = P.str();
}
Driver::~Driver() {

10
clang/lib/Driver/Tools.cpp
View File

@@ -9,7 +9,6 @@
#include "Tools.h"
#include "clang/Basic/Version.h"
#include "clang/Driver/Action.h"
#include "clang/Driver/Arg.h"
#include "clang/Driver/ArgList.h"
@@ -864,15 +863,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
Args.AddLastArg(CmdArgs, options::OPT_nobuiltininc);
// Pass the path to compiler resource files.
//
// FIXME: Get this from a configuration object.
llvm::sys::Path P(D.Dir);
P.eraseComponent(); // Remove /bin from foo/bin
P.appendComponent("lib");
P.appendComponent("clang");
P.appendComponent(CLANG_VERSION_STRING);
CmdArgs.push_back("-resource-dir");
CmdArgs.push_back(Args.MakeArgString(P.str()));
CmdArgs.push_back(D.ResourceDir.c_str());
// Add preprocessing options like -I, -D, etc. if we are using the
// preprocessor.