wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Re-ignore QEMU from gnu-toolchain | Avoid piping make version in toolchain build

Browse Source
This commit is contained in:
Abraham Gonzalez
2020-11-04 20:59:14 -08:00
parent 94eceeb624
commit 9052b41328
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/build-toolchains.sh
View File

@@ -107,14 +107,18 @@ if [ "${EC2FASTINSTALL}" = true ] ; then
git submodule deinit "${module}" || : git submodule deinit "${module}" || :
else else
"${MAKE}" --version | ( MAKE_VER=$("${MAKE}" --version) || true
read -r makever case ${MAKE_VER} in
case ${makever} in 'GNU Make '[4-9]\.*)
'GNU Make '[4-9]\.*|'GNU Make '[1-9][0-9]) ;; ;;
*) false ;; 'GNU Make '[1-9][0-9])
esac; ) || die 'obsolete make version; need GNU make 4.x or later' ;;
*)
die 'obsolete make version; need GNU make 4.x or later'
;;
esac
module_prepare riscv-gnu-toolchain module_prepare riscv-gnu-toolchain qemu
module_build riscv-gnu-toolchain --prefix="${RISCV}" --with-cmodel=medany module_build riscv-gnu-toolchain --prefix="${RISCV}" --with-cmodel=medany
echo '==> Building GNU/Linux toolchain' echo '==> Building GNU/Linux toolchain'
module_make riscv-gnu-toolchain linux module_make riscv-gnu-toolchain linux