[libcxx-commits] [libcxx] 322b532 - [libc++] Attempt to fix the 'runtimes' build

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-04-02T12:14:13-04:00
New Revision: 322b53239d4702a0f7cd63c59be2e4d5f1ee0af9

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

LOG: [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.

Added: 
    

Modified: 
    libcxx/cmake/Modules/HandleLibCXXABI.cmake

Removed: 
    


################################################################################
diff  --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake
index 2cdf82225ad6..a62efc0afa95 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()