[clang] b24e9f8 - [amdgpu-arch] Fix rpath to run from build dir
Jon Chesterfield via cfe-commits
cfe-commits at lists.llvm.org
Thu May 6 05:07:10 PDT 2021
Author: Jon Chesterfield
Date: 2021-05-06T13:07:00+01:00
New Revision: b24e9f82b71f325214c41fdc3f106207cc2244a6
URL: https://github.com/llvm/llvm-project/commit/b24e9f82b71f325214c41fdc3f106207cc2244a6
DIFF: https://github.com/llvm/llvm-project/commit/b24e9f82b71f325214c41fdc3f106207cc2244a6.diff
LOG: [amdgpu-arch] Fix rpath to run from build dir
[amdgpu-arch] Fix rpath to run from build dir
Prior to this, amdgpu-arch has RUNPATH set to $ORIGIN/../lib which works
for some installs, but not from the build directory where clang executes
the tool from when running tests.
This cmake option adds the location of the rocr runtime to the RUNPATH
(note, it amends RUNPATH here, despite the cmake option referring to RPATH)
to create a binary that runs from build or install location.
Before:
RUNPATH [$ORIGIN/../lib]
After:
RUNPATH [$ORIGIN/../lib:$HOME/llvm-install/lib]
Credit to Greg for knowing this trick and pointing to examples of it in use
for the aomp build scripts.
Reviewed By: pdhaliwal
Differential Revision: https://reviews.llvm.org/D101926
Added:
Modified:
clang/tools/amdgpu-arch/CMakeLists.txt
Removed:
################################################################################
diff --git a/clang/tools/amdgpu-arch/CMakeLists.txt b/clang/tools/amdgpu-arch/CMakeLists.txt
index fca58c4060edd..caead440c5ccf 100644
--- a/clang/tools/amdgpu-arch/CMakeLists.txt
+++ b/clang/tools/amdgpu-arch/CMakeLists.txt
@@ -14,4 +14,6 @@ endif()
add_clang_tool(amdgpu-arch AMDGPUArch.cpp)
+set_target_properties(amdgpu-arch PROPERTIES INSTALL_RPATH_USE_LINK_PATH ON)
+
clang_target_link_libraries(amdgpu-arch PRIVATE hsa-runtime64::hsa-runtime64)
More information about the cfe-commits
mailing list