From 849bfd91960d93d6027bd3188cf1541f6cdfe42a Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Tue, 16 May 2023 08:29:17 -0700 Subject: [PATCH] SWDEV-310152 - Use the RUNPATH provided by build scripts RUNPATH in libraries will be : $ORIGIN RUNPATH in binaries will be : $ORIGIN/../lib Change-Id: I87b6a7d1f58f20499c3a0913d03701ac687d910d [ROCm/clr commit: 31d1420c5439df9608a206e40cedf1c509a21201] --- projects/clr/hipamd/CMakeLists.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt index cda6863de7..2369a32f6b 100755 --- a/projects/clr/hipamd/CMakeLists.txt +++ b/projects/clr/hipamd/CMakeLists.txt @@ -39,10 +39,6 @@ include(GNUInstallDirs) # By default, CMake will search for a folder named opencl or ROCm-OpenCL-Runtime relative to the current path. Specify -DAMD_OPENCL_PATH=$OPENCL_DIR if opencl source is in obscure location. list(APPEND CMAKE_MODULE_PATH ${HIP_COMMON_DIR}/cmake) -# required to add the right link to libhsa-runtime in install/lib path -# CMAKE_PREFIX_PATH is used as rpath to search for libs outside HIP -set(CMAKE_INSTALL_RPATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}") -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ############################# # Options @@ -190,12 +186,6 @@ else () set (HIP_LIB_VERSION_PATCH ${HIP_VERSION_PATCH}) endif () set (HIP_LIB_VERSION_STRING "${HIP_LIB_VERSION_MAJOR}.${HIP_LIB_VERSION_MINOR}.${HIP_LIB_VERSION_PATCH}") -if (DEFINED ENV{ROCM_RPATH}) - set (CMAKE_INSTALL_RPATH "$ENV{ROCM_RPATH}") - set (CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - set (CMAKE_SKIP_BUILD_RPATH TRUE) - set (CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) -endif () # overwrite HIP_VERSION_PATCH for packaging set(HIP_VERSION ${HIP_VERSION_MAJOR}.${HIP_VERSION_MINOR}.${HIP_PACKAGING_VERSION_PATCH})