Updating the Pascal superbuild scripts to force the runpaths to be pr…

…operly set.
LLNL · Jun 17, 2024 · 8c2ad9e · 8c2ad9e
1 parent 991cd65
commit 8c2ad9e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 1 deletion.
diff --git a/scripts/build_lbann.sh b/scripts/build_lbann.sh
@@ -1092,7 +1092,6 @@ export LBANN_PYTHON_DIR=\$(dirname ${LBANN_PYTHON})
 # Postpend the paths to the build tools to avoid putting system paths up front
 export PATH=\${PATH}:\${LBANN_CMAKE_DIR}:\${LBANN_NINJA_DIR}:\${LBANN_PYTHON_DIR}
 export PYTHONPATH=\${LBANN_PYTHONPATH}:\${PYTHONPATH}
-export LD_LIBRARY_PATH=\$\{CRAY_LD_LIBRARY_PATH\}:\$\{LD_LIBRARY_PATH\}
 EOF
 
         if [[ -n "${MODULE_CMD}" ]]; then

diff --git a/scripts/superbuild/ci/ci_pascal_core_dependencies.sh b/scripts/superbuild/ci/ci_pascal_core_dependencies.sh
@@ -53,6 +53,7 @@ cmake \
     -D CMAKE_PREFIX_PATH=${CMAKE_CMAKE_PREFIX_PATH} \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
+    -D CMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
     \
     -D CMAKE_C_COMPILER=$(which gcc) \
     -D CMAKE_CXX_COMPILER=$(which g++) \

diff --git a/scripts/superbuild/ci/ci_pascal_dha.sh b/scripts/superbuild/ci/ci_pascal_dha.sh
@@ -64,6 +64,7 @@ cmake \
     -D CMAKE_PREFIX_PATH=${CMAKE_CMAKE_PREFIX_PATH} \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
+    -D CMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
     \
     -D CMAKE_C_COMPILER=$(which gcc) \
     -D CMAKE_CXX_COMPILER=$(which g++) \

diff --git a/scripts/superbuild/ci/ci_pascal_dha_distconv.sh b/scripts/superbuild/ci/ci_pascal_dha_distconv.sh
@@ -63,6 +63,7 @@ cmake \
     -D CMAKE_PREFIX_PATH=${CMAKE_CMAKE_PREFIX_PATH} \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
+    -D CMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
     \
     -D CMAKE_C_COMPILER=$(which gcc) \
     -D CMAKE_CXX_COMPILER=$(which g++) \

diff --git a/scripts/superbuild/ci/ci_pascal_dha_half.sh b/scripts/superbuild/ci/ci_pascal_dha_half.sh
@@ -64,6 +64,7 @@ cmake \
     -D CMAKE_PREFIX_PATH=${CMAKE_CMAKE_PREFIX_PATH} \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
+    -D CMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
     \
     -D CMAKE_C_COMPILER=$(which gcc) \
     -D CMAKE_CXX_COMPILER=$(which g++) \