diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-04-25 13:29:03 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-04-25 13:29:03 +0000 |
| commit | e73a9fd95fcf9071f8eaafd4d093a774151e673e (patch) | |
| tree | 5f71dd5ee137e052dfb02159edcb2e78d39d14ff | |
| parent | 1e77d0fd75f375193d36cc814cc01af460a33f0e (diff) | |
| download | clang_35a-e73a9fd95fcf9071f8eaafd4d093a774151e673e.tar.gz | |
Revert "Reland r206934 with a hopefully fixed test"
This reverts commit r207155.
The test was still failing.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@207225 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Driver/WindowsToolChain.cpp | 2 | ||||
| -rw-r--r-- | test/Driver/windows-include-env.c | 4 |
2 files changed, 1 insertions, 5 deletions
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<StringRef, 8> 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 c3287dd139..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 -c %s -### 2>&1 | FileCheck %s -// CHECK: "-cc1" -// CHECK: "-internal-isystem" "my_system_headers" |