[cfe-commits] r91384 - /cfe/trunk/lib/Driver/Tools.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Mon Dec 14 19:02:52 2009
New Revision: 91384

URL: http://llvm.org/viewvc/llvm-project?rev=91384&view=rev
Log:
Driver: Pass -resource-dir to clang -cc1, since the driver presumably already found itself.

Modified:
    cfe/trunk/lib/Driver/Tools.cpp

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=91384&r1=91383&r2=91384&view=diff

==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Mon Dec 14 19:02:52 2009
@@ -9,6 +9,7 @@
 
 #include "Tools.h"
 
+#include "clang/Basic/Version.h"
 #include "clang/Driver/Action.h"
 #include "clang/Driver/Arg.h"
 #include "clang/Driver/ArgList.h"
@@ -815,7 +816,16 @@
   Args.AddLastArg(CmdArgs, options::OPT_nostdinc);
   Args.AddLastArg(CmdArgs, options::OPT_nobuiltininc);
 
-  Args.AddLastArg(CmdArgs, options::OPT_isysroot);
+  // 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()));
 
   // Add preprocessing options like -I, -D, etc. if we are using the
   // preprocessor.