https://github.com/jhuber6 created https://github.com/llvm/llvm-project/pull/136754
Summary: This was accidentally kept in the old location when we moved to the new `lib/<triple>/` location for the DeviceRTL. Move this to reduce the delta with https://github.com/llvm/llvm-project/pull/136729. >From 21abf542b32d5f2f132d188aa3e07ff31a7457da Mon Sep 17 00:00:00 2001 From: Joseph Huber <hube...@outlook.com> Date: Tue, 22 Apr 2025 14:57:18 -0500 Subject: [PATCH] [OpenMP] Update the bitcode library install and search path Summary: This was accidentally kept in the old location when we moved to the new `lib/<triple>/` location for the DeviceRTL. Move this to reduce the delta with https://github.com/llvm/llvm-project/pull/136729. --- clang/lib/Driver/ToolChains/CommonArgs.cpp | 5 +++++ offload/DeviceRTL/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index 8646c55060b17..7cc4008ec1f2b 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -2794,6 +2794,11 @@ void tools::addOpenMPDeviceRTL(const Driver &D, for (const auto &LibPath : HostTC.getFilePaths()) LibraryPaths.emplace_back(LibPath); + // Check the target specific library path for the triple as well. + SmallString<128> P(D.Dir); + llvm::sys::path::append(P, "..", "lib", Triple.getTriple()); + LibraryPaths.emplace_back(P); + OptSpecifier LibomptargetBCPathOpt = Triple.isAMDGCN() ? options::OPT_libomptarget_amdgpu_bc_path_EQ : Triple.isNVPTX() ? options::OPT_libomptarget_nvptx_bc_path_EQ diff --git a/offload/DeviceRTL/CMakeLists.txt b/offload/DeviceRTL/CMakeLists.txt index 12f53a30761f3..b1c48cbaefe16 100644 --- a/offload/DeviceRTL/CMakeLists.txt +++ b/offload/DeviceRTL/CMakeLists.txt @@ -137,7 +137,7 @@ function(compileDeviceRTLLibrary target_name target_triple) "-r" "-nostdlib" "-flto" "-Wl,--lto-emit-llvm" "-march=") install(TARGETS libomptarget-${target_name} PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ - DESTINATION ${OFFLOAD_INSTALL_LIBDIR}) + DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${target_triple}") add_library(omptarget.${target_name}.all_objs OBJECT IMPORTED) set_property(TARGET omptarget.${target_name}.all_objs APPEND PROPERTY IMPORTED_OBJECTS _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
