[libcxx-commits] [libcxx] 8d85cd3 - [libc++] Don't build against libcxxrt by default on FreeBSD (#84484)

[via libcxx-commits]

Author: Louis Dionne
Date: 2024-03-08T15:47:43-05:00
New Revision: 8d85cd3a59f65315bbadaf11c4b3f107238456db

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

LOG: [libc++] Don't build against libcxxrt by default on FreeBSD (#84484)

The libc++ CMake build aims to provide a general-purpose configuration
that matches the canonical LLVM setup (libc++ / libc++abi / libunwind),
not the configuration used for compatibility on any given system. For
these "compatibility" configurations, we use CMake caches like
Apple.cmake and FreeBSD.cmake.

Defaulting to libcxxrt on FreeBSD makes it look as though we're trying
to build the system compatible configuration on FreeBSD, which isn't
really correct and causes confusion more than anything else.

Fixes #84476

Added: 
    

Modified: 
    libcxx/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index d392e95077ac57..e565c47c76687a 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -229,8 +229,6 @@ option(LIBCXX_USE_COMPILER_RT "Use compiler-rt instead of libgcc" OFF)
 # ABI Library options ---------------------------------------------------------
 if (MSVC)
   set(LIBCXX_DEFAULT_ABI_LIBRARY "vcruntime")
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-  set(LIBCXX_DEFAULT_ABI_LIBRARY "libcxxrt")
 else()
   set(LIBCXX_DEFAULT_ABI_LIBRARY "libcxxabi")
 endif()