Skip to content

Commit b048080

Browse files
committed
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
1 parent fa2d797 commit b048080

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

build_macos.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi --q
1212
# RISC-V prerequisites
1313
echo "Listing local"
1414
ls /usr/local/bin
15-
rm /usr/local/bin/2to3*
16-
rm /usr/local/bin/idle3*
17-
rm /usr/local/bin/pip*
18-
rm /usr/local/bin/py*
19-
arch -x86_64 /usr/local/bin/brew install python3 gawk gnu-sed gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
20-
arch -arm64 /opt/homebrew/bin/brew install python3 gawk gnu-sed gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
15+
rm /usr/local/bin/2to3* || true
16+
rm /usr/local/bin/idle3* || true
17+
rm /usr/local/bin/pip* || true
18+
rm /usr/local/bin/py* || true
19+
arch -x86_64 /usr/local/bin/brew install python3 gawk gnu-sed make gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
20+
arch -arm64 /opt/homebrew/bin/brew install python3 gawk gnu-sed make gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
2121

2222
repos=$(cat config/repositories.json | jq -c '.repositories.[]')
2323
export version=$(cat ./version.txt)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export GDB_TARGET_FLAGS_EXTRA
1515
cd riscv-gnu-toolchain
1616
./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
1717
# 4 threads, as 8 threads runs out of memory
18-
make -j4
18+
gmake -j4
1919

2020
# Make x64 and Windows toolchains, by copying multilib into existing toolchains
2121
cd ..

0 commit comments

Comments
 (0)