r207155 - Reland r206934 with a hopefully fixed test

[Reid Kleckner]

Author: rnk
Date: Thu Apr 24 18:06:17 2014
New Revision: 207155

URL: http://llvm.org/viewvc/llvm-project?rev=207155&view=rev
Log:
Reland r206934 with a hopefully fixed test

Added:
    cfe/trunk/test/Driver/windows-include-env.c
Modified:
    cfe/trunk/lib/Driver/WindowsToolChain.cpp

Modified: cfe/trunk/lib/Driver/WindowsToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/WindowsToolChain.cpp?rev=207155&r1=207154&r2=207155&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/WindowsToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/WindowsToolChain.cpp Thu Apr 24 18:06:17 2014
@@ -293,7 +293,6 @@ void Windows::AddClangSystemIncludeArgs(
   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(
       return;
   }
 
+#ifdef _MSC_VER
   std::string VSDir;
   std::string WindowsSDKDir;
 

Added: cfe/trunk/test/Driver/windows-include-env.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/windows-include-env.c?rev=207155&view=auto
==============================================================================
--- cfe/trunk/test/Driver/windows-include-env.c (added)
+++ cfe/trunk/test/Driver/windows-include-env.c Thu Apr 24 18:06:17 2014
@@ -0,0 +1,4 @@
+// RUN: env INCLUDE=my_system_headers %clang --target=i686-windows -c %s -### 2>&1 | FileCheck %s
+// RUN: env INCLUDE=my_system_headers %clang_cl -c %s -### 2>&1 | FileCheck %s
+// CHECK: "-cc1"
+// CHECK: "-internal-isystem" "my_system_headers"