This is an archive of the discontinued LLVM Phabricator instance.

Differential D112856

[lldb] Only specify LLVM_ENABLE_RUNTIMES in the libcxx error message.
ClosedPublic

Authored by JDevlieghere on Oct 29 2021, 4:28 PM.

Details

Reviewers
teemperor
labath
Commits
rG64cc073abd59: [lldb] Only specify LLVM_ENABLE_RUNTIMES in the libcxx error message.
Summary

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.

Diff Detail

Revision Contents

PathSize
lldb/
test/
21 lines

Diff 383821

lldb/test/CMakeLists.txt

Show First 20 Lines • Show All 111 Lines • ▼ Show 20 Lines if(APPLE)
if(LLDB_BUILT_STANDALONE) if(LLDB_BUILT_STANDALONE)
# For now check that the include directory exists. # For now check that the include directory exists.
set(cxx_dir "${LLVM_BINARY_DIR}/include/c++") set(cxx_dir "${LLVM_BINARY_DIR}/include/c++")
if(NOT EXISTS ${cxx_dir}) if(NOT EXISTS ${cxx_dir})
message(WARNING "LLDB test suite requires libc++ in llvm/projects/libcxx or an existing build symlinked to ${cxx_dir}") message(WARNING "LLDB test suite requires libc++ in llvm/projects/libcxx or an existing build symlinked to ${cxx_dir}")
endif() endif()
else() else()
# We require libcxx for the test suite, so if we aren't building it, # 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(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 message(FATAL_ERROR
"LLDB test suite requires libc++, but it is currently disabled. " "LLDB test suite requires libc++, but it is currently disabled. "
"Please checkout `libcxx` in `llvm/projects` or disable tests " "Please add `libcxx` to `LLVM_ENABLE_RUNTIMES` or disable tests via "
"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`.") "`LLDB_INCLUDE_TESTS=OFF`.")
endif() endif()
endif() endif()
endif() endif()
endif()
# Add libc++ dependency for libc++-specific tests. This is an optional # Add libc++ dependency for libc++-specific tests. This is an optional
# dependency as it's also possible to run the libc++ tests against the libc++ # dependency as it's also possible to run the libc++ tests against the libc++
# installed on the system. # installed on the system.
if (TARGET cxx) if (TARGET cxx)
add_lldb_test_dependency(cxx) add_lldb_test_dependency(cxx)
endif() endif()
▲ Show 20 Lines • Show All 94 Lines • Show Last 20 Lines