[cfe-commits] r143770 - in /cfe/trunk/lib/Driver: CMakeLists.txt ToolChains.cpp

[NAKAMURA Takumi]

Bill please pick it up into release_30, or clang could not be built on msvc.

2011/11/5 Michael J. Spencer <bigcheesegs at gmail.com>:
> Author: mspencer
> Date: Fri Nov  4 19:46:46 2011
> New Revision: 143770
>
> URL: http://llvm.org/viewvc/llvm-project?rev=143770&view=rev
> Log:
> Fix MSVC build.
>
> Modified:
>    cfe/trunk/lib/Driver/CMakeLists.txt
>    cfe/trunk/lib/Driver/ToolChains.cpp
>
> Modified: cfe/trunk/lib/Driver/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/CMakeLists.txt?rev=143770&r1=143769&r2=143770&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Driver/CMakeLists.txt (original)
> +++ cfe/trunk/lib/Driver/CMakeLists.txt Fri Nov  4 19:46:46 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/trunk/lib/Driver/ToolChains.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=143770&r1=143769&r2=143770&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Driver/ToolChains.cpp (original)
> +++ cfe/trunk/lib/Driver/ToolChains.cpp Fri Nov  4 19:46:46 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;
> @@ -2182,7 +2184,7 @@
>     path = vsIDEInstallDir;
>     return true;
>   }
> -
> +
>   if (hasVCExpressDir && vsExpressIDEInstallDir[0]) {
>     char *p = (char*)strstr(vsExpressIDEInstallDir, "\\Common7\\IDE");
>     if (p)
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>