Author: Louis Dionne Date: 2026-08-05T05:59:21-04:00 New Revision: b5c9e1b7bd50ef79fdfa91a7f2292f30889a2fa3
URL: https://github.com/llvm/llvm-project/commit/b5c9e1b7bd50ef79fdfa91a7f2292f30889a2fa3 DIFF: https://github.com/llvm/llvm-project/commit/b5c9e1b7bd50ef79fdfa91a7f2292f30889a2fa3.diff LOG: [runtimes] Remove override of LLVM_ENABLE_PER_TARGET_RUNTIME_DIR on Darwin (#213748) It should be possible to produce a per-target include directory even on Apple platforms. That's not the way we ship the library by default, but there's no reason not to allow selecting that configuration. Added: Modified: libcxx/CMakeLists.txt libcxx/test/benchmarks/CMakeLists.txt libcxxabi/CMakeLists.txt libunwind/CMakeLists.txt Removed: ################################################################################ diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index 31aaf2977a9af..8e63054dd11ec 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -470,7 +470,7 @@ set(LIBCXX_SHARED_OUTPUT_NAME "c++" CACHE STRING "Output name for the shared lib set(LIBCXX_STATIC_OUTPUT_NAME "c++" CACHE STRING "Output name for the static libc++ runtime library.") # TODO: Use common runtimes infrastructure for output and install paths -if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) set(LIBCXX_TARGET_SUBDIR ${LLVM_DEFAULT_TARGET_TRIPLE}) if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBCXX_TARGET_SUBDIR /${LIBCXX_LIBDIR_SUBDIR}) diff --git a/libcxx/test/benchmarks/CMakeLists.txt b/libcxx/test/benchmarks/CMakeLists.txt index b0fe600623d96..b3f881a008b80 100644 --- a/libcxx/test/benchmarks/CMakeLists.txt +++ b/libcxx/test/benchmarks/CMakeLists.txt @@ -11,7 +11,7 @@ set(BENCHMARK_COMPILE_FLAGS -Wl,-rpath,${LIBCXX_LIBRARY_DIR} ${SANITIZER_FLAGS} ) -if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) list(APPEND BENCHMARK_COMPILE_FLAGS -isystem "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}") endif() diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index d9ab9c494c063..902d4247fe6f7 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -207,7 +207,7 @@ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING "Path where built libc++abi runtime libraries should be installed.") # TODO: Use common runtimes infrastructure for output and install paths -if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) set(LIBCXXABI_TARGET_SUBDIR ${LLVM_DEFAULT_TARGET_TRIPLE}) if(LIBCXXABI_LIBDIR_SUBDIR) string(APPEND LIBCXXABI_TARGET_SUBDIR /${LIBCXXABI_LIBDIR_SUBDIR}) diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 7f9c757bbd212..93a3a0b74c876 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -162,7 +162,7 @@ set(LIBUNWIND_SHARED_OUTPUT_NAME "unwind" CACHE STRING "Output name for the shar set(LIBUNWIND_STATIC_OUTPUT_NAME "unwind" CACHE STRING "Output name for the static libunwind runtime library.") # TODO: Use common runtimes infrastructure for output and install paths -if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) set(LIBUNWIND_TARGET_SUBDIR ${LLVM_DEFAULT_TARGET_TRIPLE}) if(LIBUNWIND_LIBDIR_SUBDIR) string(APPEND LIBUNWIND_TARGET_SUBDIR /${LIBUNWIND_LIBDIR_SUBDIR}) _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
