r206973 - This reverts commit r206934 and r206935.

[Rafael Espindola]

Author: rafael
Date: Wed Apr 23 07:38:13 2014
New Revision: 206973

URL: http://llvm.org/viewvc/llvm-project?rev=206973&view=rev
Log:
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.

Removed:
    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=206973&r1=206972&r2=206973&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/WindowsToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/WindowsToolChain.cpp Wed Apr 23 07:38:13 2014
@@ -293,6 +293,7 @@ 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;
@@ -304,7 +305,6 @@ void Windows::AddClangSystemIncludeArgs(
       return;
   }
 
-#ifdef _MSC_VER
   std::string VSDir;
   std::string WindowsSDKDir;
 

Removed: cfe/trunk/test/Driver/windows-include-env.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/windows-include-env.c?rev=206972&view=auto
==============================================================================
--- cfe/trunk/test/Driver/windows-include-env.c (original)
+++ cfe/trunk/test/Driver/windows-include-env.c (removed)
@@ -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"