From 322b53239d4702a0f7cd63c59be2e4d5f1ee0af9 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Thu, 2 Apr 2020 12:08:10 -0400 Subject: [PATCH] [libc++] Attempt to fix the 'runtimes' build The 'runtimes' build started failing because libc++ stopped using the in-tree libc++abi when HAVE_CXXABI is set after 61e89737c. This commit tries to bring back the old behavior when HAVE_CXXABI is set in order to fix CIs. However, we really need to sit down and discuss what ways of building libc++ are supported and formalize them, because having the libc++ build system branch on basically random variables in some CMake cache somewhere is not a viable path forward. --- libcxx/cmake/Modules/HandleLibCXXABI.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake index 2cdf822..a62efc0 100644 --- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake +++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake @@ -104,7 +104,7 @@ if ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libstdc++" OR elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi") set(LIBCXX_CXX_ABI_INCLUDE_PATHS "${LIBCXX_SOURCE_DIR}/../libcxxabi/include") - if(LIBCXX_STANDALONE_BUILD) + if(LIBCXX_STANDALONE_BUILD AND NOT (LIBCXX_CXX_ABI_INTREE OR HAVE_LIBCXXABI)) set(shared c++abi) set(static c++abi) else() -- 2.7.4