diff options
| -rw-r--r-- | src/Detect.cxx | 2 | ||||
| -rw-r--r-- | test/expect/cmd.cc-msvc-c-cmd.stderr.txt | 2 | ||||
| -rw-r--r-- | test/expect/cmd.cc-msvc-cxx-cmd.stderr.txt | 2 |
3 files changed, 2 insertions, 4 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, ';'); diff --git a/test/expect/cmd.cc-msvc-c-cmd.stderr.txt b/test/expect/cmd.cc-msvc-c-cmd.stderr.txt index 7c2e031..fb9ae02 100644 --- a/test/expect/cmd.cc-msvc-c-cmd.stderr.txt +++ b/test/expect/cmd.cc-msvc-c-cmd.stderr.txt @@ -1 +1 @@ -"clang" .* "-[^i][^"]*" "[^-"][^"]*" "-isystem" "[^"]*/include" "-isystem" "/some/include" "-isystem" "/some/other/include" "-[^i] +"clang" .* "-[^i][^"]*" "[^-"][^"]*" "-isystem" "/some/include" "-isystem" "/some/other/include" "-[^i] diff --git a/test/expect/cmd.cc-msvc-cxx-cmd.stderr.txt b/test/expect/cmd.cc-msvc-cxx-cmd.stderr.txt index 7c2e031..fb9ae02 100644 --- a/test/expect/cmd.cc-msvc-cxx-cmd.stderr.txt +++ b/test/expect/cmd.cc-msvc-cxx-cmd.stderr.txt @@ -1 +1 @@ -"clang" .* "-[^i][^"]*" "[^-"][^"]*" "-isystem" "[^"]*/include" "-isystem" "/some/include" "-isystem" "/some/other/include" "-[^i] +"clang" .* "-[^i][^"]*" "[^-"][^"]*" "-isystem" "/some/include" "-isystem" "/some/other/include" "-[^i] |