From 5877be893fa26872d1cbf140b315d19f6731d866 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 23 Apr 2014 12:38:13 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@206973 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/WindowsToolChain.cpp | 2 +- test/Driver/windows-include-env.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 test/Driver/windows-include-env.c diff --git a/lib/Driver/WindowsToolChain.cpp b/lib/Driver/WindowsToolChain.cpp index aba06d6ef8..cd6d7e16fc 100644 --- a/lib/Driver/WindowsToolChain.cpp +++ b/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 Dirs; @@ -304,7 +305,6 @@ void Windows::AddClangSystemIncludeArgs(const ArgList &DriverArgs, return; } -#ifdef _MSC_VER std::string VSDir; std::string WindowsSDKDir; diff --git a/test/Driver/windows-include-env.c b/test/Driver/windows-include-env.c deleted file mode 100644 index 105a1887b7..0000000000 --- a/test/Driver/windows-include-env.c +++ /dev/null @@ -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" -- 2.40.0