r207225 - Revert "Reland r206934 with a hopefully fixed test"
Rafael Espindola
rafael.espindola at gmail.com
Fri Apr 25 06:29:03 PDT 2014
Author: rafael
Date: Fri Apr 25 08:29:03 2014
New Revision: 207225
URL: http://llvm.org/viewvc/llvm-project?rev=207225&view=rev
Log:
Revert "Reland r206934 with a hopefully fixed test"
This reverts commit r207155.
The test was still failing.
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=207225&r1=207224&r2=207225&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/WindowsToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/WindowsToolChain.cpp Fri Apr 25 08:29:03 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=207224&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 -c %s -### 2>&1 | FileCheck %s
-// CHECK: "-cc1"
-// CHECK: "-internal-isystem" "my_system_headers"
More information about the cfe-commits
mailing list