commit 26e809692adbdd3188d5d3aeb7597f9122ec5939
author Francois Pichet <pichet2000@gmail.com> Mon Sep 19 05:15:54 2011 +0000
committer Francois Pichet <pichet2000@gmail.com> Mon Sep 19 05:15:54 2011 +0000
tree 0b426ccf6b7d8d114742b3ee0373bd97934bff47
parent 39cba5343d023b08348f7e6fc7281b05b872c28c

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

clang/lib/Frontend/CompilerInvocation.cpp

diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 7a18ebf..a8d98b2 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -1373,7 +1373,8 @@
   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))