diff options
| author | Reid Kleckner <reid@kleckner.net> | 2014-04-24 23:06:17 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2014-04-24 23:06:17 +0000 |
| commit | 02091f0c8ec941a8f7f21cbfde8706ada91c504c (patch) | |
| tree | f9d902dc04ace00ce88bee85b195e58b75027064 | |
| parent | 0ba2e26a594f6a420b6daf7e371b8c1579968f52 (diff) | |
| download | clang_35a-02091f0c8ec941a8f7f21cbfde8706ada91c504c.tar.gz | |
Reland r206934 with a hopefully fixed test
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@207155 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, 5 insertions, 1 deletions
diff --git a/lib/Driver/WindowsToolChain.cpp b/lib/Driver/WindowsToolChain.cpp index cd6d7e16fc..aba06d6ef8 100644 --- a/lib/Driver/WindowsToolChain.cpp +++ b/lib/Driver/WindowsToolChain.cpp @@ -293,7 +293,6 @@ 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; @@ -305,6 +304,7 @@ 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 new file mode 100644 index 0000000000..c3287dd139 --- /dev/null +++ b/test/Driver/windows-include-env.c @@ -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" |