From 318e95f0e48254945ebe70d29994b3c08f4356d6 Mon Sep 17 00:00:00 2001 From: Robert Lytton Date: Fri, 1 Aug 2014 13:11:46 +0000 Subject: [PATCH] Xcore target: Fix CXXStdlibIncludeArgs to check 'nostdinc++' flag too. Summary: There are no tests as it is dependant upon the environment variables XCC_C_INCLUDE_PATH & XCC_CPLUS_INCLUDE_PATH being set. Differential Revision: http://reviews.llvm.org/D4621 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@214510 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 9b0ea03a08..15ae27cb89 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -3511,7 +3511,8 @@ void XCore::addClangTargetOptions(const llvm::opt::ArgList &DriverArgs, void XCore::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (DriverArgs.hasArg(options::OPT_nostdinc) || - DriverArgs.hasArg(options::OPT_nostdlibinc)) + DriverArgs.hasArg(options::OPT_nostdlibinc) || + DriverArgs.hasArg(options::OPT_nostdincxx)) return; if (const char *cl_include_dir = getenv("XCC_CPLUS_INCLUDE_PATH")) { SmallVector Dirs; -- 2.40.0