Commit bc12345c authored by Tanya Lattner's avatar Tanya Lattner
Browse files

Merge r143770 from mainline to fix MSVC build. 

llvm-svn: 144894
parent 1b871840

clang/lib/Driver/CMakeLists.txt

+8 −0
Original line number Diff line number Diff line
@@ -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)

clang/lib/Driver/ToolChains.cpp

+4 −2
Original line number Diff line number Diff line
@@ -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;