From 91025061cde9443ccb1b58d26013fa86434aaf44 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Tue, 13 Oct 2026 15:19:07 -0700 Subject: [PATCH] Regenerate to mitigate LD_* assignment related to RPATH. --- builds/cmake/install-cmake.sh | 20 +++++++++++--------- builds/cmake/install-presets.sh | 20 +++++++++++--------- builds/gnu/install-gnu.sh | 20 +++++++++++--------- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/builds/cmake/install-cmake.sh b/builds/cmake/install-cmake.sh index 0a46173f5..f40a3c6ef 100755 --- a/builds/cmake/install-cmake.sh +++ b/builds/cmake/install-cmake.sh @@ -264,16 +264,18 @@ main() msg_verbose "No --prefix specified, defaulting to '${PREFIX}'." else # Incorporate the custom libdir into each object, for link time resolution - if [[ -z "${LD_RUN_PATH}" ]]; then - export LD_RUN_PATH="${PREFIX}/lib" - else - export LD_RUN_PATH="${LD_RUN_PATH}:${PREFIX}/lib" - fi + if [[ "${BUILD_LINK}" == "dynamic" ]]; then + if [[ -z "${LD_RUN_PATH}" ]]; then + export LD_RUN_PATH="${PREFIX}/lib" + else + export LD_RUN_PATH="${LD_RUN_PATH}:${PREFIX}/lib" + fi - if [[ -z "${LD_LIBRARY_PATH}" ]]; then - export LD_LIBRARY_PATH="${PREFIX}/lib" - else - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PREFIX}/lib" + if [[ -z "${LD_LIBRARY_PATH}" ]]; then + export LD_LIBRARY_PATH="${PREFIX}/lib" + else + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PREFIX}/lib" + fi fi fi diff --git a/builds/cmake/install-presets.sh b/builds/cmake/install-presets.sh index 00f2c20a1..9e21affa7 100755 --- a/builds/cmake/install-presets.sh +++ b/builds/cmake/install-presets.sh @@ -280,16 +280,18 @@ main() msg_verbose "No --prefix specified, defaulting to '${PREFIX}'." else # Incorporate the custom libdir into each object, for link time resolution - if [[ -z "${LD_RUN_PATH}" ]]; then - export LD_RUN_PATH="${PREFIX}/lib" - else - export LD_RUN_PATH="${LD_RUN_PATH}:${PREFIX}/lib" - fi + if [[ "${BUILD_LINK}" == "dynamic" ]]; then + if [[ -z "${LD_RUN_PATH}" ]]; then + export LD_RUN_PATH="${PREFIX}/lib" + else + export LD_RUN_PATH="${LD_RUN_PATH}:${PREFIX}/lib" + fi - if [[ -z "${LD_LIBRARY_PATH}" ]]; then - export LD_LIBRARY_PATH="${PREFIX}/lib" - else - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PREFIX}/lib" + if [[ -z "${LD_LIBRARY_PATH}" ]]; then + export LD_LIBRARY_PATH="${PREFIX}/lib" + else + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PREFIX}/lib" + fi fi fi diff --git a/builds/gnu/install-gnu.sh b/builds/gnu/install-gnu.sh index ba545d1b5..6114b98fa 100755 --- a/builds/gnu/install-gnu.sh +++ b/builds/gnu/install-gnu.sh @@ -265,16 +265,18 @@ main() msg_verbose "No --prefix specified, defaulting to '${PREFIX}'." else # Incorporate the custom libdir into each object, for link time resolution - if [[ -z "${LD_RUN_PATH}" ]]; then - export LD_RUN_PATH="${PREFIX}/lib" - else - export LD_RUN_PATH="${LD_RUN_PATH}:${PREFIX}/lib" - fi + if [[ "${BUILD_LINK}" == "dynamic" ]]; then + if [[ -z "${LD_RUN_PATH}" ]]; then + export LD_RUN_PATH="${PREFIX}/lib" + else + export LD_RUN_PATH="${LD_RUN_PATH}:${PREFIX}/lib" + fi - if [[ -z "${LD_LIBRARY_PATH}" ]]; then - export LD_LIBRARY_PATH="${PREFIX}/lib" - else - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PREFIX}/lib" + if [[ -z "${LD_LIBRARY_PATH}" ]]; then + export LD_LIBRARY_PATH="${PREFIX}/lib" + else + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PREFIX}/lib" + fi fi fi