diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-11 21:20:56 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-11 21:26:38 (GMT) |
| commit | 9c573f8c437f4ab83e7eefc76df2076345a667fa (patch) | |
| tree | 685af4fc930941a891bd4cf79bd9d97a4359c64c /src | |
| parent | 1cf66488ca969eefcd4299e51122445474285238 (diff) | |
| download | CastXML-9c573f8c437f4ab83e7eefc76df2076345a667fa.zip CastXML-9c573f8c437f4ab83e7eefc76df2076345a667fa.tar.gz CastXML-9c573f8c437f4ab83e7eefc76df2076345a667fa.tar.bz2 | |
Detect: Do not use Clang builtin include dir with --castxml-cc-msvc
In commit 8d8aacd6 (Detect: Use Clang builtin include dir even with
--castxml-cc-<id>, 2015-02-04) we added the Clang builtin include dir
to the beginning of the include path detected by --castxml-cc-msvc.
However, since we use only the detected predefined macros and not
those builtin to Clang, the Clang builtin headers cannot be included
safely. Revert that part of the commit for now.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Detect.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/Detect.cxx b/src/Detect.cxx index 3714847..100cba8 100644 --- a/src/Detect.cxx +++ b/src/Detect.cxx @@ -176,8 +176,6 @@ static bool detectCC_MSVC(const char* const* argBeg, if(const char* predefs = strstr(out.c_str(), "\n#define")) { opts.Predefines = predefs+1; } - // Prepend the Clang compiler builtin include directory. - opts.Includes.push_back(getClangBuiltinIncludeDir()); if(const char* includes_str = cxsys::SystemTools::GetEnv("INCLUDE")) { std::vector<std::string> includes; cxsys::SystemTools::Split(includes_str, includes, ';'); |