Commit b4aff121 authored by Vladimir Vereschaka's avatar Vladimir Vereschaka
Browse files

Revert "[CMake] Filter libc++abi and libunwind from runtimes build in MSVC" 

This reverts commit 9986b88e.

These changes break ARM/Aarch64 cross builders on Windows platform

* http://lab.llvm.org:8011/builders/llvm-clang-win-x-armv7l
* http://lab.llvm.org:8011/builders/llvm-clang-win-x-aarch64

suppressing building libc++abi/libunwind by "just built" toolchain.

Differential Revision: https://reviews.llvm.org/D73812
parent fe6e77f6

llvm/runtimes/CMakeLists.txt

+0 −6
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ if(LLVM_ENABLE_RUNTIMES STREQUAL "all" ) 
  set(LLVM_ENABLE_RUNTIMES ${LLVM_ALL_RUNTIMES})

endif()

foreach(proj ${LLVM_ENABLE_RUNTIMES})

  # TODO: libunwind and libcxxabi don't currently build on Windows so filter them out.

  if(MSVC AND ("${proj}" MATCHES "libunwind|libcxxabi"))

    message(WARNING "Skipping ${proj} which is not supported in MSVC yet")

    continue()

  endif()



  set(proj_dir "${CMAKE_CURRENT_SOURCE_DIR}/../../${proj}")

  if(IS_DIRECTORY ${proj_dir} AND EXISTS ${proj_dir}/CMakeLists.txt)

    list(APPEND runtimes ${proj_dir})