[libcxx-commits] [libcxx] b4b7c98 - [libc++] Remove support for specifying LIBCXX_CXX_ABI_SYSTEM manually

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-04-03T14:11:11-04:00
New Revision: b4b7c989d6f1f255b49c34caf38748062d5402cc

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

LOG: [libc++] Remove support for specifying LIBCXX_CXX_ABI_SYSTEM manually

This was only kept until Chromium fixed their build of libc++, which
they have now done according to
	https://bugs.chromium.org/p/chromium/issues/detail?id=1067216

Added: 
    

Modified: 
    libcxx/cmake/Modules/HandleLibCXXABI.cmake

Removed: 
    


################################################################################
diff  --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake
index f5d15f89e2a9..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_CXX_ABI_SYSTEM OR LIBCXX_STANDALONE_BUILD) AND NOT (LIBCXX_CXX_ABI_INTREE OR HAVE_LIBCXXABI))
+  if(LIBCXX_STANDALONE_BUILD AND NOT (LIBCXX_CXX_ABI_INTREE OR HAVE_LIBCXXABI))
     set(shared c++abi)
     set(static c++abi)
   else()