From 260df2b95a2ffeac364b88b325ea2cd41fd38eb5 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 5acfaa9d..d6cc0c7c 100755 --- a/builds/cmake/install-cmake.sh +++ b/builds/cmake/install-cmake.sh @@ -278,16 +278,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 4e200834..758abf76 100755 --- a/builds/cmake/install-presets.sh +++ b/builds/cmake/install-presets.sh @@ -294,16 +294,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 48643a4c..7341f134 100755 --- a/builds/gnu/install-gnu.sh +++ b/builds/gnu/install-gnu.sh @@ -279,16 +279,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