67 lines
3.2 KiB
Diff
67 lines
3.2 KiB
Diff
From 2e1760e66725a8afabf9dd3680312a54403c8e53 Mon Sep 17 00:00:00 2001
|
|
From: q66 <q66@chimera-linux.org>
|
|
Date: Fri, 29 Nov 2024 19:42:47 +0100
|
|
Subject: [PATCH 12/29] libc++,libc++abi,libunwind: disable multiarch locations
|
|
|
|
---
|
|
libcxx/CMakeLists.txt | 2 +-
|
|
libcxx/test/benchmarks/CMakeLists.txt | 2 +-
|
|
libcxxabi/CMakeLists.txt | 2 +-
|
|
libunwind/CMakeLists.txt | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
|
|
index 17cf7c7ed..6eba3b170 100644
|
|
--- a/libcxx/CMakeLists.txt
|
|
+++ b/libcxx/CMakeLists.txt
|
|
@@ -414,7 +414,7 @@ set(LIBCXX_INSTALL_MODULES_DIR "share/libc++/v1" CACHE STRING
|
|
set(LIBCXX_SHARED_OUTPUT_NAME "c++" CACHE STRING "Output name for the shared libc++ runtime library.")
|
|
set(LIBCXX_STATIC_OUTPUT_NAME "c++" CACHE STRING "Output name for the static libc++ runtime library.")
|
|
|
|
-if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
|
+if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
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 b0fe60062..304d68e10 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 AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
list(APPEND BENCHMARK_COMPILE_FLAGS
|
|
-isystem "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}")
|
|
endif()
|
|
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
|
|
index 1d03714f5..d69813bd0 100644
|
|
--- a/libcxxabi/CMakeLists.txt
|
|
+++ b/libcxxabi/CMakeLists.txt
|
|
@@ -182,7 +182,7 @@ set(CMAKE_MODULE_PATH
|
|
set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING
|
|
"Path where built libc++abi runtime libraries should be installed.")
|
|
|
|
-if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
|
+if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
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 3c8499fd3..93b078659 100644
|
|
--- a/libunwind/CMakeLists.txt
|
|
+++ b/libunwind/CMakeLists.txt
|
|
@@ -140,7 +140,7 @@ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING
|
|
set(LIBUNWIND_SHARED_OUTPUT_NAME "unwind" CACHE STRING "Output name for the shared libunwind runtime library.")
|
|
set(LIBUNWIND_STATIC_OUTPUT_NAME "unwind" CACHE STRING "Output name for the static libunwind runtime library.")
|
|
|
|
-if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
|
+if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
set(LIBUNWIND_TARGET_SUBDIR ${LLVM_DEFAULT_TARGET_TRIPLE})
|
|
if(LIBUNWIND_LIBDIR_SUBDIR)
|
|
string(APPEND LIBUNWIND_TARGET_SUBDIR /${LIBUNWIND_LIBDIR_SUBDIR})
|
|
--
|
|
2.49.0
|
|
|