From 9cef8874ec046db3ba4784d4b2a2e608466f7d0c Mon Sep 17 00:00:00 2001
From: "Michael J. Spencer" <bigcheesegs@gmail.com>
Date: Sat, 5 Nov 2011 00:46:46 +0000
Subject: [PATCH] Fix MSVC build.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143770 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/Driver/CMakeLists.txt | 8 ++++++++
lib/Driver/ToolChains.cpp | 6 ++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt
index ee7ded94d4d..ac63a2dfbb4 100644
--- a/lib/Driver/CMakeLists.txt
+++ b/lib/Driver/CMakeLists.txt
@@ -21,5 +21,13 @@ add_clang_library(clangDriver
Types.cpp
)
+IF(MSVC)
+ get_target_property(NON_ANSI_COMPILE_FLAGS clangDriver COMPILE_FLAGS)
+ string(REPLACE /Za
+ "" NON_ANSI_COMPILE_FLAGS
+ ${NON_ANSI_COMPILE_FLAGS})
+ set_target_properties(clangDriver PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
+ENDIF(MSVC)
+
add_dependencies(clangDriver ClangAttrList ClangDiagnosticDriver
ClangDriverOptions ClangCC1Options ClangCC1AsOptions)
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 9e34b0288cd..8083fe075f1 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -44,7 +44,9 @@
// environment.
#ifdef _MSC_VER
#define WIN32_LEAN_AND_MEAN 1
- #include <windows.h>
+ #include <Windows.h>
+ #undef min
+ #undef max
#endif
using namespace clang::driver;
@@ -2182,7 +2184,7 @@ static bool getVisualStudioDir(std::string &path) {
path = vsIDEInstallDir;
return true;
}
-
+
if (hasVCExpressDir && vsExpressIDEInstallDir[0]) {
char *p = (char*)strstr(vsExpressIDEInstallDir, "\\Common7\\IDE");
if (p)
--
GitLab