From: Zachary Turner <zturner@google.com>
Date: Wed, 15 Mar 2017 17:09:36 +0000 (+0000)
Subject: Don't use MSVC Setup Api on MinGW.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09d53961867c7e5ea760ff11d88763553eb1c878;p=clang

Don't use MSVC Setup Api on MinGW.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@297861 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/ToolChains/MSVC.cpp b/lib/Driver/ToolChains/MSVC.cpp
index ce8e1b2b60..3d7c1d76ae 100644
--- a/lib/Driver/ToolChains/MSVC.cpp
+++ b/lib/Driver/ToolChains/MSVC.cpp
@@ -44,6 +44,11 @@
     #define NOMINMAX
   #endif
   #include <windows.h>
+#endif
+
+#ifdef _MSC_VER
+// Don't support SetupApi on MinGW.
+#define USE_MSVC_SETUP_API
 
 // Make sure this comes before MSVCSetupApi.h
 #include <comdef.h>
@@ -170,7 +175,7 @@ static bool findVCToolChainViaEnvironment(std::string &Path,
 // longer listed in the registry.
 static bool findVCToolChainViaSetupConfig(std::string &Path,
                                           bool &IsVS2017OrNewer) {
-#if !defined(USE_WIN32)
+#if !defined(USE_MSVC_SETUP_API)
   return false;
 #else
   // FIXME: This really should be done once in the top-level program's main