test

Author: will-v-pi

build_macos.sh

@@ -8,13 +8,7 @@ SKIP_OPENOCD=${SKIP_OPENOCD-0}
 SKIP_PICOTOOL=${SKIP_PICOTOOL-0}
 
 # Install prerequisites
-if [[ $(uname -m) == 'arm64' ]]; then
-    ARCH_x86="arch -x86_64"
-else
-    ARCH_x86=""
-fi
-
-ARCH_x86 /usr/local/bin/brew install jq libtool libusb automake hidapi jimtcl --quiet
+arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi jimtcl --quiet
 if [[ $(uname -m) == 'arm64' ]]; then
     arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi jimtcl --quiet
 fi
@@ -25,7 +19,7 @@ rm /usr/local/bin/2to3* || true
 rm /usr/local/bin/idle3* || true
 rm /usr/local/bin/pip* || true
 rm /usr/local/bin/py* || true
-ARCH_x86 /usr/local/bin/brew install python3 gawk gnu-sed make gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
+arch -x86_64 /usr/local/bin/brew install python3 gawk gnu-sed make gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
 if [[ $(uname -m) == 'arm64' ]]; then
     arch -arm64 /opt/homebrew/bin/brew install python3 gawk gnu-sed make gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
 fi
@@ -73,7 +67,7 @@ if [[ "$SKIP_RISCV" != 1 ]]; then
     ../packages/macos/riscv/build-riscv-gcc.sh
 fi
 if [[ "$SKIP_PICOTOOL" != 1 ]]; then
-    ARCH_x86 ../packages/macos/picotool/build-picotool.sh
+    arch -x86_64 ../packages/macos/picotool/build-picotool.sh
     if [[ $(uname -m) == 'arm64' ]]; then
         arch -arm64 ../packages/macos/picotool/build-picotool.sh
     fi