[cfe-commits] r143751 - in /cfe/trunk: include/clang/Driver/ToolChain.h lib/Driver/ToolChain.cpp

Chandler Carruth chandlerc at gmail.com
Fri Nov 4 16:49:01 PDT 2011

Author: chandlerc
Date: Fri Nov  4 18:49:01 2011
New Revision: 143751

URL: http://llvm.org/viewvc/llvm-project?rev=143751&view=rev
Switch the C++ include interface in the ToolChain to use the same naming
as the system include interface before I start adding implementations of
it to individual ToolChain implementations.


Modified: cfe/trunk/include/clang/Driver/ToolChain.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/ToolChain.h?rev=143751&r1=143750&r2=143751&view=diff
--- cfe/trunk/include/clang/Driver/ToolChain.h (original)
+++ cfe/trunk/include/clang/Driver/ToolChain.h Fri Nov  4 18:49:01 2011
@@ -208,8 +208,8 @@
   /// AddClangCXXStdlibIncludeArgs - Add the clang -cc1 level arguments to set
   /// the include paths to use for the given C++ standard library type.
-  virtual void AddClangCXXStdlibIncludeArgs(const ArgList &Args,
-                                            ArgStringList &CmdArgs) const;
+  virtual void AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
+                                            ArgStringList &CC1Args) const;
   /// AddCXXStdlibLibArgs - Add the system specific linker arguments to use
   /// for the given C++ standard library type.

Modified: cfe/trunk/lib/Driver/ToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChain.cpp?rev=143751&r1=143750&r2=143751&view=diff
--- cfe/trunk/lib/Driver/ToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChain.cpp Fri Nov  4 18:49:01 2011
@@ -230,8 +230,8 @@
   return ToolChain::CST_Libstdcxx;
-void ToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &Args,
-                                             ArgStringList &CmdArgs) const {
+void ToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
+                                             ArgStringList &CC1Args) const {
   // Header search paths should be handled by each of the subclasses.
   // Historically, they have not been, and instead have been handled inside of
   // the CC1-layer frontend. As the logic is hoisted out, this generic function
@@ -241,7 +241,7 @@
   // '-stdlib=' flag down to CC1 so that it can in turn customize the C++
   // header search paths with it. Once all systems are overriding this
   // function, the CC1 flag and this line can be removed.
-  Args.AddAllArgs(CmdArgs, options::OPT_stdlib_EQ);
+  DriverArgs.AddAllArgs(CC1Args, options::OPT_stdlib_EQ);
 void ToolChain::AddCXXStdlibLibArgs(const ArgList &Args,

More information about the cfe-commits mailing list