From 26e809692adbdd3188d5d3aeb7597f9122ec5939 Mon Sep 17 00:00:00 2001 From: Francois Pichet Date: Mon, 19 Sep 2011 05:15:54 +0000 Subject: 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '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 @@ 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)) -- cgit v1.1