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

[Vladimir Vereschaka via llvm-commits]

Author: Vladimir Vereschaka
Date: 2020-02-07T11:28:21-08:00
New Revision: b4aff1210cd949ee3e75bf01fd8b72931441834d

URL: https://github.com/llvm/llvm-project/commit/b4aff1210cd949ee3e75bf01fd8b72931441834d
DIFF: https://github.com/llvm/llvm-project/commit/b4aff1210cd949ee3e75bf01fd8b72931441834d.diff

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

This reverts commit 9986b88e64f30f5d958eef113bae4c8a098eea93.

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

Added: 
    

Modified: 
    llvm/runtimes/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index d17a9767ea46..40869f0a12d2 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -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})