summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorFrancois Pichet <pichet2000@gmail.com>2011-09-19 05:15:54 +0000
committerFrancois Pichet <pichet2000@gmail.com>2011-09-19 05:15:54 +0000
commit26e809692adbdd3188d5d3aeb7597f9122ec5939 (patch)
tree0b426ccf6b7d8d114742b3ee0373bd97934bff47 /clang/lib
parent39cba5343d023b08348f7e6fc7281b05b872c28c (diff)
downloadbcm5719-llvm-26e809692adbdd3188d5d3aeb7597f9122ec5939.tar.gz
bcm5719-llvm-26e809692adbdd3188d5d3aeb7597f9122ec5939.zip
Do not use builtin includes if -fms-compatibility is specified. Some MSVC header files have the same name as clang's builtins, this creates clash.
llvm-svn: 140009
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Frontend/CompilerInvocation.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 7a18ebf4e11..a8d98b26089 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -1373,7 +1373,8 @@ static void ParseHeaderSearchArgs(HeaderSearchOptions &Opts, ArgList &Args) {
using namespace cc1options;
Opts.Sysroot = Args.getLastArgValue(OPT_isysroot, "/");
Opts.Verbose = Args.hasArg(OPT_v);
- Opts.UseBuiltinIncludes = !Args.hasArg(OPT_nobuiltininc);
+ Opts.UseBuiltinIncludes = !Args.hasArg(OPT_nobuiltininc) &&
+ !Args.hasArg(OPT_fms_compatibility);
Opts.UseStandardIncludes = !Args.hasArg(OPT_nostdinc);
Opts.UseStandardCXXIncludes = !Args.hasArg(OPT_nostdincxx);
if (const Arg *A = Args.getLastArg(OPT_stdlib_EQ))
OpenPOWER on IntegriCloud