summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2011-11-07 10:15:01 +0000
committerChandler Carruth <chandlerc@gmail.com>2011-11-07 10:15:01 +0000
commit2d8f608f6c9bd5cbe55f22e05f1a70d26b4b39ac (patch)
treecb74de8c381d0b9976382c46a5ae7592caba8540
parent3854a32832d878947505198269cc1dd122f7dc64 (diff)
downloadllvm-2d8f608f6c9bd5cbe55f22e05f1a70d26b4b39ac.tar.gz
Merging r143751:
------------------------------------------------------------------------ r143751 | chandlerc | 2011-11-04 16:49:01 -0700 (Fri, 04 Nov 2011) | 3 lines 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. ------------------------------------------------------------------------ llvm-svn: 143929
-rw-r--r--clang/include/clang/Driver/ToolChain.h4
-rw-r--r--clang/lib/Driver/ToolChain.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/clang/include/clang/Driver/ToolChain.h b/clang/include/clang/Driver/ToolChain.h
index 4ac158ffcea5..2e6218a23145 100644
--- a/clang/include/clang/Driver/ToolChain.h
+++ b/clang/include/clang/Driver/ToolChain.h
@@ -208,8 +208,8 @@ public:
/// 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.
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 5418436315d9..9453848ec00d 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -230,8 +230,8 @@ ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{
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 @@ void ToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &Args,
// '-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,