Author: Jonas Devlieghere Date: 2021-11-01T09:39:24-07:00 New Revision: 64cc073abd59d7ac2359d258f407254de6c79c84
URL: https://github.com/llvm/llvm-project/commit/64cc073abd59d7ac2359d258f407254de6c79c84 DIFF: https://github.com/llvm/llvm-project/commit/64cc073abd59d7ac2359d258f407254de6c79c84.diff LOG: [lldb] Only specify LLVM_ENABLE_RUNTIMES in the libcxx error message. Now that passing libcxx via LLVM_ENABLE_PROJECTS has been deprecated, update the error message and recommend using LLVM_ENABLE_RUNTIMES instead. This patch also remove the error message for the old layout. Differential revision: https://reviews.llvm.org/D112856 Added: Modified: lldb/test/CMakeLists.txt Removed: ################################################################################ diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt index dcb59cfb6c1c..d03f17335a24 100644 --- a/lldb/test/CMakeLists.txt +++ b/lldb/test/CMakeLists.txt @@ -117,23 +117,12 @@ if(TARGET clang) endif() else() # We require libcxx for the test suite, so if we aren't building it, - # try to provide a helpful error about how to resolve the situation. + # provide a helpful error about how to resolve the situation. if(NOT TARGET cxx AND NOT libcxx IN_LIST LLVM_ENABLE_RUNTIMES) - if(LLVM_ENABLE_PROJECTS STREQUAL "") - # If `LLVM_ENABLE_PROJECTS` is not being used (implying that we are - # using the old layout), suggest checking it out. - message(FATAL_ERROR - "LLDB test suite requires libc++, but it is currently disabled. " - "Please checkout `libcxx` in `llvm/projects` or disable tests " - "via `LLDB_INCLUDE_TESTS=OFF`.") - else() - # If `LLVM_ENABLE_PROJECTS` is being used, suggest adding it. - message(FATAL_ERROR - "LLDB test suite requires libc++, but it is currently disabled. " - "Please add `libcxx` to `LLVM_ENABLE_PROJECTS` or " - "`LLVM_ENABLE_RUNTIMES`, or disable tests via " - "`LLDB_INCLUDE_TESTS=OFF`.") - endif() + message(FATAL_ERROR + "LLDB test suite requires libc++, but it is currently disabled. " + "Please add `libcxx` to `LLVM_ENABLE_RUNTIMES` or disable tests via " + "`LLDB_INCLUDE_TESTS=OFF`.") endif() endif() endif() _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
