[lld] r194481 - Get lld building with MSVC2013

Alp Toker alp at nuanti.com
Tue Nov 12 07:14:33 PST 2013


Author: alp
Date: Tue Nov 12 09:14:33 2013
New Revision: 194481

URL: http://llvm.org/viewvc/llvm-project?rev=194481&view=rev
Log:
Get lld building with MSVC2013

Modified:
    lld/trunk/CMakeLists.txt

Modified: lld/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/CMakeLists.txt?rev=194481&r1=194480&r2=194481&view=diff
==============================================================================
--- lld/trunk/CMakeLists.txt (original)
+++ lld/trunk/CMakeLists.txt Tue Nov 12 09:14:33 2013
@@ -92,9 +92,7 @@ endif()
 
 # lld requires c++11 to build. Make sure that we have a compiler and standard
 # library combination that can do that.
-if (MSVC11)
-  # Do nothing, we're good.
-elseif (NOT MSVC)
+if (NOT MSVC)
   # gcc and clang require the -std=c++0x or -std=c++11 flag.
   if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang" AND
       NOT ("${CMAKE_CXX_FLAGS}" MATCHES ".*-std=(c|gnu)\\+\\+(0x|11).*"))
@@ -102,7 +100,7 @@ elseif (NOT MSVC)
       "lld requires c++11. Clang and gcc require -std=c++0x or -std=c++11 to "
       "enter this mode. Please set CMAKE_CXX_FLAGS accordingly.")
   endif()
-else()
+elseif (MSVC_VERSION LESS 1700)
   message(FATAL_ERROR "The selected compiler does not support c++11 which is "
           "required to build lld.")
 endif()





More information about the llvm-commits mailing list