Skip to content

Commit dec45d1

Browse files
committed
fix ninja and meson paths on macOS
1 parent 1346798 commit dec45d1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

wheelbuild/config.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ if [ -n "$IS_MACOS" ] && [ "$PLAT" == "arm64" ]; then
3434
export LDFLAGS="${LDFLAGS} -ld64"
3535
fi
3636

37+
mkdir -p "$BUILD_PREFIX/bin"
38+
export PATH="$PATH:$BUILD_PREFIX/bin"
39+
3740
call_and_restore_trace() {
3841
local rc
3942
local force_trace
@@ -166,6 +169,7 @@ function install_sccache {
166169
if [ -e /usr/local/bin/sccache ]; then
167170
export USE_SCCACHE=1
168171
export SCCACHE_DIR=$PWD/sccache
172+
ln -s /usr/local/bin/sccache $BUILD_PREFIX/bin
169173
fi
170174
group_end
171175
}
@@ -184,9 +188,7 @@ function install_meson {
184188
HOMEBREW_PREFIX=/opt/homebrew
185189
fi
186190
$HOMEBREW_PREFIX/bin/brew install meson
187-
if [ ! -e /usr/local/bin/meson ]; then
188-
sudo ln -s $HOMEBREW_PREFIX/bin/meson /usr/local/bin
189-
fi
191+
ln -s $HOMEBREW_PREFIX/bin/meson $BUILD_PREFIX/bin
190192
elif [ "$MB_PYTHON_VERSION" == "2.7" ]; then
191193
local python39_exe=$(cpython_path 3.9)/bin/python
192194
$python39_exe -m pip install meson
@@ -216,9 +218,7 @@ function install_ninja {
216218
HOMEBREW_PREFIX=/opt/homebrew
217219
fi
218220
$HOMEBREW_PREFIX/bin/brew install ninja
219-
if [ ! -e /usr/local/bin/ninja ]; then
220-
sudo ln -s $HOMEBREW_PREFIX/bin/ninja /usr/local/bin
221-
fi
221+
ln -s $HOMEBREW_PREFIX/bin/ninja $BUILD_PREFIX/bin
222222
else
223223
$PYTHON_EXE -m pip install ninja==1.11.1
224224
local ninja_exe=$(dirname $PYTHON_EXE)/ninja

0 commit comments

Comments
 (0)