This reverts commit r206934 and r206935.

The original messages were:
  "Driver: Honor %INCLUDE% when built with MinGW"
  "Add missing test triples"

The test was still failing on OS X.

llvm-svn: 206973

clang/lib/Driver/WindowsToolChain.cpp

@@ -293,6 +293,7 @@ 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;
@@ -304,7 +305,6 @@ void Windows::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
       return;
   }
 
-#ifdef _MSC_VER
   std::string VSDir;
   std::string WindowsSDKDir;
 

clang/test/Driver/windows-include-env.c

@@ -1,4 +0,0 @@
-// RUN: env INCLUDE=my_system_headers %clang --target=i686-windows -c %s -### 2>&1 | FileCheck %s
-// RUN: env INCLUDE=my_system_headers %clang_cl --target=i686-windows -c %s -### 2>&1 | FileCheck %s
-// CHECK: "-cc1"
-// CHECK: "-internal-isystem" "my_system_headers"