diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-04-23 12:38:13 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-04-23 12:38:13 +0000 |
| commit | e3e047e768e013c70f34d221c57012e5efe150c4 (patch) | |
| tree | 27f7630cd382e2c5f36d338cb0a571ff71c36135 /clang | |
| parent | 69927781768268e8008e77aa19e8525dd56109ec (diff) | |
| download | bcm5719-llvm-e3e047e768e013c70f34d221c57012e5efe150c4.tar.gz bcm5719-llvm-e3e047e768e013c70f34d221c57012e5efe150c4.zip | |
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
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Driver/WindowsToolChain.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/windows-include-env.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/clang/lib/Driver/WindowsToolChain.cpp b/clang/lib/Driver/WindowsToolChain.cpp index aba06d6ef8b..cd6d7e16fc9 100644 --- a/clang/lib/Driver/WindowsToolChain.cpp +++ b/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; diff --git a/clang/test/Driver/windows-include-env.c b/clang/test/Driver/windows-include-env.c deleted file mode 100644 index 105a1887b73..00000000000 --- a/clang/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" |
