Skip to content

Commit af8f5c4

Browse files
committed
fix: faster re-install, ignore warning when already installed + fix pnpm install for arm64
1 parent 188cc3a commit af8f5c4

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

script/macos-arm-deps.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ arm-brew fetch --deps --bottle-tag=$bottle_tag $dependencies |
3131
grep -E ".tar.gz" |
3232
grep -v pkg-config |
3333
awk '{ print $3 }' |
34-
xargs -n 1 arm-brew reinstall --force-bottle
34+
xargs -n 1 arm-brew install --force-bottle || true
3535

3636
# Install host version of pkg-config so we can call it in the build system
37-
arm-brew reinstall pkg-config
37+
arm-brew install pkg-config || true
3838

3939
# Add the installed binaries/libraries to the path
4040
export PATH="$HOME/arm-target/bin/:$PATH"
@@ -44,3 +44,4 @@ export PATH="$HOME/arm-target/lib/:$PATH"
4444
SODIUM_PATH=$(~/arm-target/bin/pkg-config libsodium --libs-only-L | sed -e 's/-L//g') # print only -L and replace "-L" itself
4545
export PATH="$SODIUM_PATH:$PATH"
4646
export PKG_CONFIG_PATH="$SODIUM_PATH:$PKG_CONFIG_PATH"
47+
export npm_config_target_arch=arm64

0 commit comments

Comments
 (0)