diff options
Diffstat (limited to 'lib/Driver')
| -rw-r--r-- | lib/Driver/ToolChain.cpp | 8 | ||||
| -rw-r--r-- | lib/Driver/Tools.cpp | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp index 8079e1983f..cbbbc5c4de 100644 --- a/lib/Driver/ToolChain.cpp +++ b/lib/Driver/ToolChain.cpp @@ -205,19 +205,15 @@ void ToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &Args, bool ObjCXXAutoRefCount) const { CXXStdlibType Type = GetCXXStdlibType(Args); + // Header search paths are handled by the mass of goop in InitHeaderSearch. + switch (Type) { case ToolChain::CST_Libcxx: - CmdArgs.push_back("-nostdinc++"); - CmdArgs.push_back("-cxx-isystem"); - CmdArgs.push_back("/usr/include/c++/v1"); - if (ObjCXXAutoRefCount) CmdArgs.push_back("-fobjc-arc-cxxlib=libc++"); break; case ToolChain::CST_Libstdcxx: - // Currently handled by the mass of goop in InitHeaderSearch. - if (ObjCXXAutoRefCount) CmdArgs.push_back("-fobjc-arc-cxxlib=libstdc++"); break; diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 41efccfb93..40ad2caabb 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -330,6 +330,7 @@ void Clang::AddPreprocessingOptions(const Driver &D, = types::isObjC(InputType) && isObjCAutoRefCount(Args); getToolChain().AddClangCXXStdlibIncludeArgs(Args, CmdArgs, ObjCXXAutoRefCount); + Args.AddAllArgs(CmdArgs, options::OPT_stdlib_EQ); } // Add -Wp, and -Xassembler if using the preprocessor. |