<div dir="ltr">Thanks, this was always very silly.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Sat, Jun 21, 2014 at 9:31 PM, Alp Toker <span dir="ltr"><<a href="mailto:alp@nuanti.com" target="_blank">alp@nuanti.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: alp<br>
Date: Sat Jun 21 23:31:15 2014<br>
New Revision: 211461<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=211461&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=211461&view=rev</a><br>
Log:<br>
Enable WindowsToolChain on all native Windows builds<br>
<br>
Make binaries built by MSVC, mingw and clang functionally equivalent. The<br>
checks are trivially performed at runtime to eliminate functional differences<br>
between supported configurations that used to be hard-coded.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Driver/WindowsToolChain.cpp<br>
<br>
Modified: cfe/trunk/lib/Driver/WindowsToolChain.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/WindowsToolChain.cpp?rev=211461&r1=211460&r2=211461&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/WindowsToolChain.cpp?rev=211461&r1=211460&r2=211461&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Driver/WindowsToolChain.cpp (original)<br>
+++ cfe/trunk/lib/Driver/WindowsToolChain.cpp Sat Jun 21 23:31:15 2014<br>
@@ -14,6 +14,7 @@<br>
 #include "clang/Driver/Driver.h"<br>
 #include "clang/Driver/DriverDiagnostic.h"<br>
 #include "clang/Driver/Options.h"<br>
+#include "llvm/Config/llvm-config.h"<br>
 #include "llvm/Option/Arg.h"<br>
 #include "llvm/Option/ArgList.h"<br>
 #include "llvm/Support/ErrorHandling.h"<br>
@@ -21,8 +22,7 @@<br>
<br>
 // Include the necessary headers to interface with the Windows registry and<br>
 // environment.<br>
-// TODO: Investigate enabling this with __MINGW32__.<br>
-#if defined(_MSC_VER)<br>
+#if defined(LLVM_ON_WIN32)<br>
 #define USE_WIN32<br>
 #endif<br>
<br>
@@ -283,11 +283,6 @@ void Windows::AddClangSystemIncludeArgs(<br>
   if (DriverArgs.hasArg(options::OPT_nostdlibinc))<br>
     return;<br>
<br>
-// TODO: This code path is portable. Conditionalize on LLVM_ON_WIN32 instead?<br>
-#ifndef USE_WIN32<br>
-  return;<br>
-#endif<br>
-<br>
   // Honor %INCLUDE%. It should know essential search paths with vcvarsall.bat.<br>
   if (const char *cl_include_dir = getenv("INCLUDE")) {<br>
     SmallVector<StringRef, 8> Dirs;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>