llvm/compiler-rt-paths.patch at master · pld-linux/llvm · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
--- llvm-project.src/compiler-rt/cmake/base-config-ix.cmake.orig	2022-05-25 00:02:58.000000000 +0200
+++ llvm-project.src/compiler-rt/cmake/base-config-ix.cmake	2022-05-31 12:22:26.076246743 +0200
@@ -109,13 +109,13 @@
   set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH
     "Path where built compiler-rt libraries should be installed.")
 endif()
-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_BINDIR}")
+extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "bin")
 set(COMPILER_RT_INSTALL_BINARY_DIR "${default_install_path}" CACHE PATH
   "Path where built compiler-rt executables should be installed.")
-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_INCLUDEDIR}")
+extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "include")
 set(COMPILER_RT_INSTALL_INCLUDE_DIR "${default_install_path}" CACHE PATH
   "Path where compiler-rt headers should be installed.")
-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_DATADIR}")
+extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "share")
 set(COMPILER_RT_INSTALL_DATA_DIR "${default_install_path}" CACHE PATH
   "Path where compiler-rt data files should be installed.")

--- llvm-project-22.1.3.src/llvm/cmake/modules/LLVMExternalProjectUtils.cmake.orig	2026-04-07 00:57:04.000000000 +0200
+++ llvm-project-22.1.3.src/llvm/cmake/modules/LLVMExternalProjectUtils.cmake	2026-04-29 19:54:30.983912237 +0200
@@ -391,6 +391,7 @@ function(llvm_ExternalProject_Add name s
                ${compiler_args}
                ${verbose}
                -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+               -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX}
                ${sysroot_arg}
                -DLLVM_BINARY_DIR=${PROJECT_BINARY_DIR}
                -DLLVM_CONFIG_PATH=${llvm_config_path}