summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2014-04-24 23:06:17 +0000
committerReid Kleckner <reid@kleckner.net>2014-04-24 23:06:17 +0000
commit02fefcfc3bc205abd9e4848d0e285c41fdbfc014 (patch)
tree34bb0ecf0cc62f928ed91292728aa93a9e3c44fa /clang/lib/Driver
parentae13a45d4d52f280863588cb925c46ac8d2c9db0 (diff)
downloadbcm5719-llvm-02fefcfc3bc205abd9e4848d0e285c41fdbfc014.tar.gz
bcm5719-llvm-02fefcfc3bc205abd9e4848d0e285c41fdbfc014.zip
Reland r206934 with a hopefully fixed test
llvm-svn: 207155
Diffstat (limited to 'clang/lib/Driver')
-rw-r--r--clang/lib/Driver/WindowsToolChain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Driver/WindowsToolChain.cpp b/clang/lib/Driver/WindowsToolChain.cpp
index cd6d7e16fc9..aba06d6ef8b 100644
--- a/clang/lib/Driver/WindowsToolChain.cpp
+++ b/clang/lib/Driver/WindowsToolChain.cpp
@@ -293,7 +293,6 @@ 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;
@@ -305,6 +304,7 @@ void Windows::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
return;
}
+#ifdef _MSC_VER
std::string VSDir;
std::string WindowsSDKDir;
OpenPOWER on IntegriCloud