nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

split runtimes libs install in multiples directories

Browse Source
This commit is contained in:
Nicolas Marie
2024-08-09 10:12:57 -07:00
parent 6ee95b22e5
commit 7a714f7795
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libc/CMakeLists.txt
View File

@@ -248,12 +248,12 @@ else()
endif()
if(LIBC_TARGET_TRIPLE)
set(LIBC_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LIBC_TARGET_TRIPLE})
set(LIBC_INSTALL_LIBRARY_DIR "lib${LLVM_LIBDIR_SUFFIX}/${LIBC_TARGET_TRIPLE}/libc")
elseif(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
set(LIBC_INSTALL_LIBRARY_DIR
lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE})
"lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/libc")
else()
set(LIBC_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX})
set(LIBC_INSTALL_LIBRARY_DIR "lib${LLVM_LIBDIR_SUFFIX}")
endif()
if(LIBC_TARGET_OS_IS_GPU)

2
libc/lib/CMakeLists.txt
View File

@@ -79,7 +79,7 @@ install(
if(LIBC_TARGET_OS_IS_GPU)
set(gpu_install_dir lib${LLVM_LIBDIR_SUFFIX})
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
set(gpu_install_dir lib${LLVM_LIBDIR_SUFFIX}/${LLVM_HOST_TRIPLE})
set(gpu_install_dir "lib${LLVM_LIBDIR_SUFFIX}/${LLVM_HOST_TRIPLE}/libcgpu")
endif()
install(
TARGETS ${added_gpu_archive_targets}

4
offload/CMakeLists.txt
View File

@@ -28,10 +28,10 @@ if(OPENMP_STANDALONE_BUILD)
else()
# When building in tree we install the runtime according to the LLVM settings.
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
set(OFFLOAD_INSTALL_LIBDIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE STRING
set(OFFLOAD_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/offload" CACHE STRING
"Path where built offload libraries should be installed.")
else()
set(OFFLOAD_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}" CACHE STRING
set(OFFLOAD_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}/offload" CACHE STRING
"Path where built offload libraries should be installed.")
endif()
endif()

4
openmp/CMakeLists.txt
View File

@@ -49,10 +49,10 @@ else()
# When building in tree we install the runtime according to the LLVM settings.
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
set(OPENMP_INSTALL_LIBDIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE STRING
set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/openmp" CACHE STRING
"Path where built openmp libraries should be installed.")
else()
set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}" CACHE STRING
set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}/openmp" CACHE STRING
"Path where built OpenMP libraries should be installed.")
endif()