From fefa6a0084e8d9b5821b67b5ce05fc3f620ef940 Mon Sep 17 00:00:00 2001 From: Ron Lieberman Date: Wed, 22 Nov 2023 19:20:49 -0600 Subject: [PATCH] SWDEV-433541 add 3rd level to RPATH after fileReorg Change-Id: I385c4a6a3941110a90a0223399fd2981d43c46d9 --- bin/aomp_common_vars | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/aomp_common_vars b/bin/aomp_common_vars index 9a27b8004..ec9899ccd 100644 --- a/bin/aomp_common_vars +++ b/bin/aomp_common_vars @@ -93,13 +93,13 @@ AOMP_ORIGIN_RPATH="-DCMAKE_SHARED_LINKER_FLAGS='-Wl,--disable-new-dtags' $AOMP_O # Libraries and Binaries need different RUNPATH as below if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then # ASAN RUNPATH - OPENMP_EXTRAS_LIB_RPATH='$ORIGIN:$ORIGIN/../../../lib/asan:$ORIGIN/../../../lib' - OPENMP_EXTRAS_EXE_RPATH='$ORIGIN/../lib/asan:$ORIGIN/../lib:$ORIGIN/../../lib/asan:$ORIGIN/../../lib' + OPENMP_EXTRAS_LIB_RPATH='$ORIGIN:$ORIGIN/../../../lib/asan:$ORIGIN/../../../lib:$ORIGIN/../../../../lib' + OPENMP_EXTRAS_EXE_RPATH='$ORIGIN/../lib/asan:$ORIGIN/../lib:$ORIGIN/../../lib/asan:$ORIGIN/../../lib:$ORIGIN/../../../lib' else # RUNPATH for Libraries: \$ORIGIN:\$ORIGIN/../../lib # RUNPATH for Binaries: \$ORIGIN/../lib:\$ORIGIN/../../lib - OPENMP_EXTRAS_LIB_RPATH='$ORIGIN:$ORIGIN/../../lib' - OPENMP_EXTRAS_EXE_RPATH='$ORIGIN/../lib:$ORIGIN/../../lib' + OPENMP_EXTRAS_LIB_RPATH='$ORIGIN:$ORIGIN/../lib:$ORIGIN/../../lib:$ORIGIN/../../../lib' + OPENMP_EXTRAS_EXE_RPATH='$ORIGIN/../lib:$ORIGIN/../../lib:$ORIGIN/../../../lib' fi OPENMP_EXTRAS_SHARED_LINKER_FLAGS="-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$OPENMP_EXTRAS_LIB_RPATH"