Skip to content

Commit 54f2334

Browse files
committed
More tweaks from code review.
1 parent 0e3eb70 commit 54f2334

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

.github/workflows/wheels-dependencies.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
1919
# Install them into `build/deps/darwin`
2020
WORKDIR=$(pwd)/build/darwin
2121
BUILD_PREFIX=$(pwd)/build/deps/darwin
22-
PLAT=$CIBW_ARCHS
2322
else
2423
# Build prefix will default to /usr/local
2524
WORKDIR=$(pwd)/build
26-
PLAT=$CIBW_ARCHS
2725
MB_ML_LIBC=${AUDITWHEEL_POLICY::9}
2826
MB_ML_VER=${AUDITWHEEL_POLICY:9}
2927
fi
28+
PLAT=$CIBW_ARCHS
3029

3130
# Define custom utilities
3231
source wheels/multibuild/common_utils.sh
@@ -119,9 +118,9 @@ function build {
119118
build_libjpeg_turbo
120119
if [ -n "$IS_MACOS" ]; then
121120
# Custom tiff build to include jpeg; by default, configure won't include
122-
# headers/libs in the custom macOS prefix. Explicitly disable webp and
123-
# zstd, because on x86_64 macs, it will pick up the Homebrew versions of
124-
# webp and zstd from /usr/local.
121+
# headers/libs in the custom macOS prefix. Explicitly disable webp,
122+
# libdeflate and zstd, because on x86_64 macs, it will pick up the
123+
# Homebrew versions of those libraries from /usr/local.
125124
build_simple tiff $TIFF_VERSION https://download.osgeo.org/libtiff tar.gz \
126125
--with-jpeg-include-dir=$BUILD_PREFIX/include --with-jpeg-lib-dir=$BUILD_PREFIX/lib \
127126
--disable-webp --disable-zstd --disable-libdeflate

0 commit comments

Comments
 (0)