From 490b556a0f3c9daddd05651d945662b93b3b13b9 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Wed, 30 Sep 2020 14:58:17 -0400 Subject: [PATCH] [libc++] Make sure we don't attempt to run check-cxx-abilist when libc++ doesn't define new/delete That would make the test fail spuriously because we don't generate an ABI list for that configuration. --- libcxx/lib/abi/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libcxx/lib/abi/CMakeLists.txt b/libcxx/lib/abi/CMakeLists.txt index 0fa3aac..cf7457f 100644 --- a/libcxx/lib/abi/CMakeLists.txt +++ b/libcxx/lib/abi/CMakeLists.txt @@ -22,7 +22,8 @@ if (EXISTS "${ABILIST_FILE}" AND ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi" OR (APPLE AND "${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "default")) AND NOT LIBCXX_ABI_UNSTABLE - AND LIBCXX_ENABLE_EXCEPTIONS) + AND LIBCXX_ENABLE_EXCEPTIONS + AND LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS) add_custom_target(check-cxx-abilist ${SYMDIFF_EXE} --only-stdlib-symbols --strict ${ABILIST_FILE} $ -- 2.7.4