From 297053c1fabb23b60841a5a90379d620f294b1e2 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 ad995b5ad..5a562c7ec 100755 --- a/builds/cmake/install-cmake.sh +++ b/builds/cmake/install-cmake.sh @@ -262,16 +262,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 1766d0cbd..f9c311ea3 100755 --- a/builds/cmake/install-presets.sh +++ b/builds/cmake/install-presets.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/gnu/install-gnu.sh b/builds/gnu/install-gnu.sh index 5a9221d44..9ee3bcd6d 100755 --- a/builds/gnu/install-gnu.sh +++ b/builds/gnu/install-gnu.sh @@ -263,16 +263,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