From af8f5c424d6d8169d098daca74f5437174ed9f46 Mon Sep 17 00:00:00 2001 From: Bartel Eerdekens Date: Mon, 5 Dec 2022 13:26:12 +0100 Subject: [PATCH] fix: faster re-install, ignore warning when already installed + fix pnpm install for arm64 --- script/macos-arm-deps.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/script/macos-arm-deps.sh b/script/macos-arm-deps.sh index fed373d8..a62758e5 100755 --- a/script/macos-arm-deps.sh +++ b/script/macos-arm-deps.sh @@ -31,10 +31,10 @@ arm-brew fetch --deps --bottle-tag=$bottle_tag $dependencies | grep -E ".tar.gz" | grep -v pkg-config | awk '{ print $3 }' | - xargs -n 1 arm-brew reinstall --force-bottle + xargs -n 1 arm-brew install --force-bottle || true # Install host version of pkg-config so we can call it in the build system -arm-brew reinstall pkg-config +arm-brew install pkg-config || true # Add the installed binaries/libraries to the path export PATH="$HOME/arm-target/bin/:$PATH" @@ -44,3 +44,4 @@ export PATH="$HOME/arm-target/lib/:$PATH" SODIUM_PATH=$(~/arm-target/bin/pkg-config libsodium --libs-only-L | sed -e 's/-L//g') # print only -L and replace "-L" itself export PATH="$SODIUM_PATH:$PATH" export PKG_CONFIG_PATH="$SODIUM_PATH:$PKG_CONFIG_PATH" +export npm_config_target_arch=arm64