Fix MacOS Risc-V Toolchain build

gmake is now required (riscv-collab/riscv-gnu-toolchain@7317ccf)

This is due to the use of `undefine` in the Makefile which requires make version >=3.82 - MacOS only ships with 3.81

build_macos.sh

@@ -12,12 +12,12 @@ arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi --q
 # RISC-V prerequisites
 echo "Listing local"
 ls /usr/local/bin
-rm /usr/local/bin/2to3*
-rm /usr/local/bin/idle3*
-rm /usr/local/bin/pip*
-rm /usr/local/bin/py*
-arch -x86_64 /usr/local/bin/brew install python3 gawk gnu-sed gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
-arch -arm64 /opt/homebrew/bin/brew install python3 gawk gnu-sed gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
+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_64 /usr/local/bin/brew install python3 gawk gnu-sed make gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
+arch -arm64 /opt/homebrew/bin/brew install python3 gawk gnu-sed make gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
 
 repos=$(cat config/repositories.json | jq -c '.repositories.[]')
 export version=$(cat ./version.txt)

packages/macos/riscv/build-riscv-gcc.sh

@@ -15,7 +15,7 @@ export GDB_TARGET_FLAGS_EXTRA
 cd riscv-gnu-toolchain
 ./configure --prefix=$BUILDDIR/$INSTALLDIR --with-arch=rv32ima_zicsr_zifencei_zba_zbb_zbs_zbkb_zca_zcb --with-abi=ilp32 --with-multilib-generator="rv32ima_zicsr_zifencei_zba_zbb_zbs_zbkb_zca_zcb-ilp32--;rv32imac_zicsr_zifencei_zba_zbb_zbs_zbkb-ilp32--" --with-gcc-src=$BUILDDIR/gcc
 # 4 threads, as 8 threads runs out of memory
-make -j4
+gmake -j4
 
 # Make x64 and Windows toolchains, by copying multilib into existing toolchains
 cd ..