[llvm-branch-commits] [cfe-branch] r144894 - in /cfe/branches/release_30: ./ lib/Driver/CMakeLists.txt lib/Driver/ToolChains.cpp

[Tanya Lattner]

Author: tbrethou
Date: Thu Nov 17 01:40:32 2011
New Revision: 144894

URL: http://llvm.org/viewvc/llvm-project?rev=144894&view=rev
Log:
Merge r143770 from mainline to fix MSVC build.

Modified:
    cfe/branches/release_30/   (props changed)
    cfe/branches/release_30/lib/Driver/CMakeLists.txt
    cfe/branches/release_30/lib/Driver/ToolChains.cpp

Propchange: cfe/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 17 01:40:32 2011
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142531,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143807,143822-143823,143836,143838-143842,143863,143866,143869,143871,143873-143875,143896-143897,143916-143917
+/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142531,142918,143344-143345,143684,143686-143687,143751-143752,143770,143798,143801,143804-143807,143822-143823,143836,143838-143842,143863,143866,143869,143871,143873-143875,143896-143897,143916-143917
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_30/lib/Driver/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/lib/Driver/CMakeLists.txt?rev=144894&r1=144893&r2=144894&view=diff
==============================================================================
--- cfe/branches/release_30/lib/Driver/CMakeLists.txt (original)
+++ cfe/branches/release_30/lib/Driver/CMakeLists.txt Thu Nov 17 01:40:32 2011
@@ -21,5 +21,13 @@
   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)

Modified: cfe/branches/release_30/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/lib/Driver/ToolChains.cpp?rev=144894&r1=144893&r2=144894&view=diff
==============================================================================
--- cfe/branches/release_30/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_30/lib/Driver/ToolChains.cpp Thu Nov 17 01:40:32 2011
@@ -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;
@@ -2334,7 +2336,7 @@
     path = vsIDEInstallDir;
     return true;
   }
-  
+
   if (hasVCExpressDir && vsExpressIDEInstallDir[0]) {
     char *p = (char*)strstr(vsExpressIDEInstallDir, "\\Common7\\IDE");
     if (p)