From 829d6536f805a51deeed3db6066cb6469a4d68e9 Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Tue, 10 Jan 2023 13:51:51 -0500 Subject: [PATCH] Revert "Remove RPATH/RUNPATH from ROCm libraries" This reverts commit 993b1dee7ecb8cb49bbe440af6f33dd1c1346253. Reason for revert: is blocked due to new proposal. so reverting the changes Change-Id: Id9b8cc1560ba3eea6e484e67df3fdc647da9f37d [ROCm/ROCR-Runtime commit: dbf8905dd136aa0b9b41f7a92050f4f7588712a4] --- projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt index 1135874593..c1961443f1 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt +++ b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt @@ -125,6 +125,9 @@ target_include_directories( ${CORE_RUNTIME_TARGET} ${CMAKE_CURRENT_SOURCE_DIR}/libamdhsacode ${CMAKE_CURRENT_BINARY_DIR}/core/runtime/trap_handler) +## Set RUNPATH - ../../lib covers use of the legacy symlink in /hsa/lib/ +set_property(TARGET ${CORE_RUNTIME_TARGET} PROPERTY INSTALL_RPATH "$ORIGIN;$ORIGIN/../../lib;$ORIGIN/../../lib64;$ORIGIN/../lib64" ) + ## ------------------------- Linux Compiler and Linker options ------------------------- set ( HSA_CXX_FLAGS ${HSA_COMMON_CXX_FLAGS} -fexceptions -fno-rtti -fvisibility=hidden -Wno-error=missing-braces -Wno-error=sign-compare -Wno-sign-compare -Wno-write-strings -Wno-conversion-null -fno-math-errno -fno-threadsafe-statics -fmerge-all-constants -fms-extensions -Wno-error=comment -Wno-comment -Wno-error=pointer-arith -Wno-pointer-arith -Wno-error=unused-variable -Wno-error=unused-function )