Skip to content

Commit 555fddf

Browse files
committed
guix: use GUIX_LD_WRAPPER_DISABLE_RPATH for all HOSTS
1 parent 9ec238d commit 555fddf

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

contrib/guix/libexec/build.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,18 +133,7 @@ for p in "${PATHS[@]}"; do
133133
done
134134

135135
# Disable Guix ld auto-rpath behavior
136-
case "$HOST" in
137-
*darwin*)
138-
# The auto-rpath behavior is necessary for darwin builds as some native
139-
# tools built by depends refer to and depend on Guix-built native
140-
# libraries
141-
#
142-
# After the native packages in depends are built, the ld wrapper should
143-
# no longer affect our build, as clang would instead reach for
144-
# x86_64-apple-darwin-ld from cctools
145-
;;
146-
*) export GUIX_LD_WRAPPER_DISABLE_RPATH=yes ;;
147-
esac
136+
export GUIX_LD_WRAPPER_DISABLE_RPATH=yes
148137

149138
# Make /usr/bin if it doesn't exist
150139
[ -e /usr/bin ] || mkdir -p /usr/bin

0 commit comments

Comments
 (0)