diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-01-20 02:35:16 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-01-20 02:35:16 +0000 |
| commit | 3f3e2cd820b10bc4d7310dd0aab7a86e09a62dcb (patch) | |
| tree | 62addf81222d31976418f387adaa826ad92fbbfe /clang/lib/Driver/Tools.cpp | |
| parent | e2b661c26c1ec51be3a66b768632b779bee8575e (diff) | |
| download | bcm5719-llvm-3f3e2cd820b10bc4d7310dd0aab7a86e09a62dcb.tar.gz bcm5719-llvm-3f3e2cd820b10bc4d7310dd0aab7a86e09a62dcb.zip | |
Driver: Lift clang resource directory computation to the Driver object.
llvm-svn: 93971
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 010953df5e0..5e1d2661dd1 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -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. |
