summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/Tools.cpp
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2012-07-11 16:46:17 +0000
committerNico Weber <nicolasweber@gmx.de>2012-07-11 16:46:17 +0000
commitcc19aec7ae4b5f6a2fa8aa660c3573c57a640903 (patch)
tree6736b25534839ee7065181685c384d10bc7ebb19 /clang/lib/Driver/Tools.cpp
parent6320b5213e080c6f02d3e1155131c6f21fd26bcc (diff)
downloadbcm5719-llvm-cc19aec7ae4b5f6a2fa8aa660c3573c57a640903.tar.gz
bcm5719-llvm-cc19aec7ae4b5f6a2fa8aa660c3573c57a640903.zip
Default to -std=c++11 on Windows.
llvm-svn: 160052
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
-rw-r--r--clang/lib/Driver/Tools.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 66d792ffba3..4e03603416d 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -2124,8 +2124,11 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
// eventually we want to do all the standard defaulting here instead of
// splitting it between the driver and clang -cc1.
if (!types::isCXX(InputType))
- Args.AddAllArgsTranslated(CmdArgs, options::OPT_std_default_EQ,
- "-std=", /*Joined=*/true);
+ Args.AddAllArgsTranslated(CmdArgs, options::OPT_std_default_EQ,
+ "-std=", /*Joined=*/true);
+ else if (getToolChain().getTriple().getOS() == llvm::Triple::Win32)
+ CmdArgs.push_back("-std=c++11");
+
Args.AddLastArg(CmdArgs, options::OPT_trigraphs);
}
OpenPOWER on IntegriCloud