Weijia Wang
27d33c33ed
* llvmPackages_git: 18.0.0-unstable-2023-12-13 -> 18.1.0-rc1 * llvmPackages_git: refresh patches * llvmPackages_git.libcxx: link against libgcc_s explicitly * llvmPackages_git.compiler-rt: update path to cpu_model * llvmPackages_git.libcxxabi: do not use llvm unwinder by default * llvmPackages_git: 18.1.0-rc1 -> 18.1.0-rc2 * llvmPackages_git: 18.1.0-rc2 -> 18.1.0-rc3
23 lines
1.0 KiB
Diff
23 lines
1.0 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b6ddbe90516d..311ab1d50e7f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -29,7 +29,7 @@ if (OPENMP_STANDALONE_BUILD)
|
|
set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING
|
|
"Suffix of lib installation directory, e.g. 64 => lib64")
|
|
# Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR.
|
|
- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}" CACHE STRING
|
|
+ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}" CACHE STRING
|
|
"Path where built OpenMP libraries should be installed.")
|
|
|
|
# Group test settings.
|
|
@@ -47,7 +47,7 @@ if (OPENMP_STANDALONE_BUILD)
|
|
else()
|
|
set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR})
|
|
# If building in tree, we honor the same install suffix LLVM uses.
|
|
- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}" CACHE STRING
|
|
+ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" CACHE STRING
|
|
"Path where built OpenMP libraries should be installed.")
|
|
|
|
if (NOT MSVC)
|