0012-libc-libc-abi-libunwind-disable-multiarch-locations.patch (3265B)
1 From 2e1760e66725a8afabf9dd3680312a54403c8e53 Mon Sep 17 00:00:00 2001 2 From: q66 <q66@chimera-linux.org> 3 Date: Fri, 29 Nov 2024 19:42:47 +0100 4 Subject: [PATCH 12/29] libc++,libc++abi,libunwind: disable multiarch locations 5 6 --- 7 libcxx/CMakeLists.txt | 2 +- 8 libcxx/test/benchmarks/CMakeLists.txt | 2 +- 9 libcxxabi/CMakeLists.txt | 2 +- 10 libunwind/CMakeLists.txt | 2 +- 11 4 files changed, 4 insertions(+), 4 deletions(-) 12 13 diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt 14 index 17cf7c7ed..6eba3b170 100644 15 --- a/libcxx/CMakeLists.txt 16 +++ b/libcxx/CMakeLists.txt 17 @@ -414,7 +414,7 @@ set(LIBCXX_INSTALL_MODULES_DIR "share/libc++/v1" CACHE STRING 18 set(LIBCXX_SHARED_OUTPUT_NAME "c++" CACHE STRING "Output name for the shared libc++ runtime library.") 19 set(LIBCXX_STATIC_OUTPUT_NAME "c++" CACHE STRING "Output name for the static libc++ runtime library.") 20 21 -if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) 22 +if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "Linux") 23 set(LIBCXX_TARGET_SUBDIR ${LLVM_DEFAULT_TARGET_TRIPLE}) 24 if(LIBCXX_LIBDIR_SUBDIR) 25 string(APPEND LIBCXX_TARGET_SUBDIR /${LIBCXX_LIBDIR_SUBDIR}) 26 diff --git a/libcxx/test/benchmarks/CMakeLists.txt b/libcxx/test/benchmarks/CMakeLists.txt 27 index b0fe60062..304d68e10 100644 28 --- a/libcxx/test/benchmarks/CMakeLists.txt 29 +++ b/libcxx/test/benchmarks/CMakeLists.txt 30 @@ -11,7 +11,7 @@ set(BENCHMARK_COMPILE_FLAGS 31 -Wl,-rpath,${LIBCXX_LIBRARY_DIR} 32 ${SANITIZER_FLAGS} 33 ) 34 -if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) 35 +if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "Linux") 36 list(APPEND BENCHMARK_COMPILE_FLAGS 37 -isystem "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}") 38 endif() 39 diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt 40 index 1d03714f5..d69813bd0 100644 41 --- a/libcxxabi/CMakeLists.txt 42 +++ b/libcxxabi/CMakeLists.txt 43 @@ -182,7 +182,7 @@ set(CMAKE_MODULE_PATH 44 set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING 45 "Path where built libc++abi runtime libraries should be installed.") 46 47 -if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) 48 +if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "Linux") 49 set(LIBCXXABI_TARGET_SUBDIR ${LLVM_DEFAULT_TARGET_TRIPLE}) 50 if(LIBCXXABI_LIBDIR_SUBDIR) 51 string(APPEND LIBCXXABI_TARGET_SUBDIR /${LIBCXXABI_LIBDIR_SUBDIR}) 52 diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt 53 index 3c8499fd3..93b078659 100644 54 --- a/libunwind/CMakeLists.txt 55 +++ b/libunwind/CMakeLists.txt 56 @@ -140,7 +140,7 @@ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING 57 set(LIBUNWIND_SHARED_OUTPUT_NAME "unwind" CACHE STRING "Output name for the shared libunwind runtime library.") 58 set(LIBUNWIND_STATIC_OUTPUT_NAME "unwind" CACHE STRING "Output name for the static libunwind runtime library.") 59 60 -if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) 61 +if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "Linux") 62 set(LIBUNWIND_TARGET_SUBDIR ${LLVM_DEFAULT_TARGET_TRIPLE}) 63 if(LIBUNWIND_LIBDIR_SUBDIR) 64 string(APPEND LIBUNWIND_TARGET_SUBDIR /${LIBUNWIND_LIBDIR_SUBDIR}) 65 -- 66 2.49.0 67