summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/Tools.cpp
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2013-09-18 00:33:59 +0000
committerReid Kleckner <reid@kleckner.net>2013-09-18 00:33:59 +0000
commitc106fdafdd0973b88cc00ac4d661d04d17e2968f (patch)
treeeb37d3c7583a1b251dcdde55d1eb916394d57841 /clang/lib/Driver/Tools.cpp
parent0daa1225c6a70fed6200c57523c1499ad9525b83 (diff)
downloadbcm5719-llvm-c106fdafdd0973b88cc00ac4d661d04d17e2968f.tar.gz
bcm5719-llvm-c106fdafdd0973b88cc00ac4d661d04d17e2968f.zip
Claim compatibility with VS 2012 by default
This will define _MSC_VER to 1700 by default and avoid linker errors from /failifmismatch linker directives in the C++ standard headers. Most people trying out the Visual Studio integration are using 2012, since that's the only version that clang-format works with. This way they don't have to pass funky -Xclang -fmsc-version=1700 flags just to link against the standard C++ runtime. llvm-svn: 190908
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
-rw-r--r--clang/lib/Driver/Tools.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 3dde81c5970..a728b4dc81c 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -3116,13 +3116,13 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
true))))
CmdArgs.push_back("-fms-compatibility");
- // -fmsc-version=1300 is default.
+ // -fmsc-version=1700 is default.
if (Args.hasFlag(options::OPT_fms_extensions, options::OPT_fno_ms_extensions,
getToolChain().getTriple().getOS() == llvm::Triple::Win32) ||
Args.hasArg(options::OPT_fmsc_version)) {
StringRef msc_ver = Args.getLastArgValue(options::OPT_fmsc_version);
if (msc_ver.empty())
- CmdArgs.push_back("-fmsc-version=1300");
+ CmdArgs.push_back("-fmsc-version=1700");
else
CmdArgs.push_back(Args.MakeArgString("-fmsc-version=" + msc_ver));
}
OpenPOWER on IntegriCloud