Get lld building with MSVC2013

llvm-svn: 194481
This commit is contained in:
Alp Toker 2013-11-12 15:14:33 +00:00
parent c51098d4aa
commit c544d5b7e8
1 changed files with 2 additions and 4 deletions

View File

@ -92,9 +92,7 @@ endif()
# lld requires c++11 to build. Make sure that we have a compiler and standard # lld requires c++11 to build. Make sure that we have a compiler and standard
# library combination that can do that. # library combination that can do that.
if (MSVC11) if (NOT MSVC)
# Do nothing, we're good.
elseif (NOT MSVC)
# gcc and clang require the -std=c++0x or -std=c++11 flag. # gcc and clang require the -std=c++0x or -std=c++11 flag.
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang" AND if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang" AND
NOT ("${CMAKE_CXX_FLAGS}" MATCHES ".*-std=(c|gnu)\\+\\+(0x|11).*")) 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 " "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.") "enter this mode. Please set CMAKE_CXX_FLAGS accordingly.")
endif() endif()
else() elseif (MSVC_VERSION LESS 1700)
message(FATAL_ERROR "The selected compiler does not support c++11 which is " message(FATAL_ERROR "The selected compiler does not support c++11 which is "
"required to build lld.") "required to build lld.")
endif() endif()