From 82b4216e40f6d71ba84464f0a2ae52a2ffd2efca Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Tue, 16 May 2023 04:08:12 -0700 Subject: [PATCH] Use the RUNPATH provided by build scripts RUNPATH in libraries will be : $ORIGIN RUNPATH in binaries will be : $ORIGIN/../lib Change-Id: Iafa66a8e02cc8c5783903d40927b63652042d2f1 [ROCm/ROCR-Runtime commit: ad002f1e7b07cfc3adc3d7143b0f835cd958c967] --- projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt index e8280bf0f1..5a75ace543 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt +++ b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt @@ -125,8 +125,6 @@ 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 -mmwaitx )