summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2017-03-15 17:09:36 +0000
committerZachary Turner <zturner@google.com>2017-03-15 17:09:36 +0000
commit545202b8f18636c960e12466d439d18bda874006 (patch)
tree815b4156243c3c8e2ea6240c161969d322f5995b /clang/lib
parentbcb6093610f20375ce0fb55624469e10e0ff94c9 (diff)
downloadbcm5719-llvm-545202b8f18636c960e12466d439d18bda874006.tar.gz
bcm5719-llvm-545202b8f18636c960e12466d439d18bda874006.zip
Don't use MSVC Setup Api on MinGW.
llvm-svn: 297861
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Driver/ToolChains/MSVC.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains/MSVC.cpp b/clang/lib/Driver/ToolChains/MSVC.cpp
index ce8e1b2b600..3d7c1d76ae7 100644
--- a/clang/lib/Driver/ToolChains/MSVC.cpp
+++ b/clang/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
OpenPOWER on IntegriCloud