diff --git a/scripts/build-toolchains.sh b/scripts/build-toolchains.sh index 734398c3..738b5ae7 100755 --- a/scripts/build-toolchains.sh +++ b/scripts/build-toolchains.sh @@ -99,6 +99,13 @@ if [ "${EC2FASTINSTALL}" = true ] ; then git submodule deinit "${module}" || : else + "${MAKE}" --version | ( + read -r makever + case ${makever} in + 'GNU Make '[4-9]\.*|'GNU Make '[1-9][0-9]) ;; + *) false ;; + esac; ) || die 'obsolete make version; need GNU make 4.x or later' + module_prepare riscv-gnu-toolchain qemu module_build riscv-gnu-toolchain --prefix="${RISCV}" echo '==> Building GNU/Linux toolchain' diff --git a/scripts/build-util.sh b/scripts/build-util.sh index 5ca38147..be58a6a1 100644 --- a/scripts/build-util.sh +++ b/scripts/build-util.sh @@ -14,7 +14,7 @@ case ${ncpu} in *) export MAKEFLAGS="-j ${ncpu} ${MAKEFLAGS}" ;; esac -MAKE=$(command -v gmake || command -v make) +MAKE=$(command -v gnumake || command -v gmake || command -v make) readonly MAKE