diff options
| author | Joseph Huber <huberjn@outlook.com> | 2024-03-01 15:52:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 15:52:20 -0600 |
| commit | 2fb764d2dae288f24335dfc168b5491a1017fc83 (patch) | |
| tree | 1029719b5e37bcdc65fd1bf454497cb58ca6f1ba | |
| parent | ae76dfb74701e05e5ab4be194e20e49f10768e46 (diff) | |
| download | llvm-2fb764d2dae288f24335dfc168b5491a1017fc83.zip llvm-2fb764d2dae288f24335dfc168b5491a1017fc83.tar.gz llvm-2fb764d2dae288f24335dfc168b5491a1017fc83.tar.bz2 | |
[libomptarget] Fix 'libomptarget' libraries being installed twice (#83624)
Summary:
We use `add_llvm_library` as a shorthand for setting up all the
dependencies and libraries we need for the OpenMP offloading runtime as
they depend on a lot of the LLVM utilities. However, we always
explicitly installed these manually. Behind the scenes the function
would then install it again. This was unnoticed because until now the
destinations matched. Now that we want it to optionally go into the
other directory it is duplicating them. Fix this by stating that this is
a build tree only library so we can handle it ourselves.
4 files changed, 4 insertions, 0 deletions
diff --git a/openmp/libomptarget/plugins-nextgen/CMakeLists.txt b/openmp/libomptarget/plugins-nextgen/CMakeLists.txt index 3cc2b85..3ca0236 100644 --- a/openmp/libomptarget/plugins-nextgen/CMakeLists.txt +++ b/openmp/libomptarget/plugins-nextgen/CMakeLists.txt @@ -46,6 +46,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tmachine}$") ${OPENMP_PTHREAD_LIB} NO_INSTALL_RPATH + BUILDTREE_ONLY ) if(LIBOMPTARGET_DEP_LIBFFI_FOUND) diff --git a/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt b/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt index 68ce634..9e0ea08 100644 --- a/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt +++ b/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt @@ -78,6 +78,7 @@ add_llvm_library(omptarget.rtl.amdgpu SHARED ${LDFLAGS_UNDEFINED} NO_INSTALL_RPATH + BUILDTREE_ONLY ) if ((OMPT_TARGET_DEFAULT) AND (LIBOMPTARGET_OMPT_SUPPORT)) diff --git a/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt b/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt index 95b288c..2bfb471 100644 --- a/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +++ b/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt @@ -38,6 +38,7 @@ add_llvm_library(omptarget.rtl.cuda SHARED ${OPENMP_PTHREAD_LIB} NO_INSTALL_RPATH + BUILDTREE_ONLY ) if ((OMPT_TARGET_DEFAULT) AND (LIBOMPTARGET_OMPT_SUPPORT)) diff --git a/openmp/libomptarget/src/CMakeLists.txt b/openmp/libomptarget/src/CMakeLists.txt index 1a0e26f..9bc3f333 100644 --- a/openmp/libomptarget/src/CMakeLists.txt +++ b/openmp/libomptarget/src/CMakeLists.txt @@ -41,6 +41,7 @@ add_llvm_library(omptarget omp NO_INSTALL_RPATH + BUILDTREE_ONLY ) target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) |