maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[msvc] Honor %INCLUDE%. It should know essential search paths with vcvarsall.bat. 

FYI,

On VS10, %INCLUDE% contains;
(VS10)\VC\INCLUDE
(VS10)\VC\ATLMFC\INCLUDE
(SDK70A)\include

On VS11,
(VS11)\VC\INCLUDE
(VS11)\VC\ATLMFC\INCLUDE
(SDK80)\include\shared
(SDK80)\include\um
(SDK80)\include\winrt

FIXME: It may be enabled also on mingw.
llvm-svn: 152589
This commit is contained in:
NAKAMURA Takumi 2012-03-13 00:02:21 +00:00
parent c114e0cf3c
commit b5ee8a6deb
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clang/lib/Driver/WindowsToolChain.cpp
View File

@ -318,10 +318,26 @@ void Windows::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
if (DriverArgs.hasArg(options::OPT_nostdlibinc))
return;
#ifdef _MSC_VER
// Honor %INCLUDE%. It should know essential search paths with vcvarsall.bat.
if (const char *cl_include_dir = getenv("INCLUDE")) {
SmallVector<StringRef, 8> Dirs;
StringRef(cl_include_dir).split(Dirs, ";");
int n = 0;
for (SmallVectorImpl<StringRef>::iterator I = Dirs.begin(), E = Dirs.end();
I != E; ++I) {
StringRef d = *I;
if (d.size() == 0)
continue;
++n;
addSystemInclude(DriverArgs, CC1Args, d);
}
if (n) return;
}
std::string VSDir;
std::string WindowsSDKDir;
#ifdef _MSC_VER
// When built with access to the proper Windows APIs, try to actually find
// the correct include paths first.
if (getVisualStudioDir(VSDir)) {