From 555fddf646265f7e57a416dc64b171f2c9460e20 Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 21 Apr 2022 10:24:59 +0100 Subject: [PATCH] guix: use GUIX_LD_WRAPPER_DISABLE_RPATH for all HOSTS --- contrib/guix/libexec/build.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index e0c8baf3fed..f589ac7a55a 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -133,18 +133,7 @@ for p in "${PATHS[@]}"; do done # Disable Guix ld auto-rpath behavior -case "$HOST" in - *darwin*) - # The auto-rpath behavior is necessary for darwin builds as some native - # tools built by depends refer to and depend on Guix-built native - # libraries - # - # After the native packages in depends are built, the ld wrapper should - # no longer affect our build, as clang would instead reach for - # x86_64-apple-darwin-ld from cctools - ;; - *) export GUIX_LD_WRAPPER_DISABLE_RPATH=yes ;; -esac +export GUIX_LD_WRAPPER_DISABLE_RPATH=yes # Make /usr/bin if it doesn't exist [ -e /usr/bin ] || mkdir -p /usr/bin