Skip to content

Commit 9dc6904

Browse files
committed
Correct the lookup of libfribidi on x86 macOS installs.
1 parent 681a03b commit 9dc6904

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

.github/workflows/wheels-test.sh

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,18 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
77
# However, we *do* need Homebrew to provide a copy of fribidi for
88
# testing purposes so that we can verify the fribidi shim works as expected.
99
if [[ "$(uname -m)" == "x86_64" ]]; then
10-
# Use the "installed" location, rather than /usr/local, for two reasons:
11-
# firstly, Homebrew allows libraries to be *installed*, but not linked;
12-
# and secondly, we don't want any *other* leakage from /usr/local.
13-
HOMEBREW_HOME=/usr/local/Homebrew
10+
HOMEBREW_PREFIX=/usr/local
1411
else
15-
HOMEBREW_HOME=/opt/homebrew
12+
HOMEBREW_PREFIX=/opt/homebrew
1613
fi
17-
$HOMEBREW_HOME/bin/brew install fribidi
14+
$HOMEBREW_PREFIX/bin/brew install fribidi
1815

1916
# Add the lib folder for fribidi so that the vendored library can be found.
20-
# Don't use /opt/homebrew/lib directly - use the lib folder where the
17+
# Don't use $HOMEWBREW_PREFIX/lib directly - use the lib folder where the
2118
# installed copy of fribidi is cellared. This ensures we don't pick up the
2219
# Homebrew version of any other library that we're dependent on (most notably,
2320
# freetype).
24-
export DYLD_LIBRARY_PATH=$(dirname $(realpath $HOMEBREW_HOME/lib/libfribidi.dylib))
21+
export DYLD_LIBRARY_PATH=$(dirname $(realpath $HOMEBREW_PREFIX/lib/libfribidi.dylib))
2522
elif [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then
2623
apk add curl fribidi
2724
else

0 commit comments

Comments
 (0)