From 161ec3ffb765b6f2d19350d886f524c40fd89557 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Sat, 8 Feb 2025 12:20:17 -0500 Subject: [PATCH] update handling of [g]make --- tool/cosmocc/package.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tool/cosmocc/package.sh b/tool/cosmocc/package.sh index efb7402d8..b66cfbde4 100755 --- a/tool/cosmocc/package.sh +++ b/tool/cosmocc/package.sh @@ -22,22 +22,20 @@ _nproc() { esac } -which_make() { - case $(uname -s) in - Darwin) echo gmake ;; - *) echo make ;; - esac -} - TMPDIR=${TMPDIR:-/tmp} - OUTDIR=${1:-cosmocc} APELINK=o/$(mode)/tool/build/apelink AMD64=${2:-x86_64} ARM64=${3:-aarch64} NPROC=$(($(_nproc)/2)) GCCVER=14.1.0 -MAKE=$(which_make) + +if ! MAKE=$(command -v gmake); then + if ! MAKE=$(command -v make); then + echo please install gnu make >&2 + exit 1 + fi +fi $MAKE -j$NPROC m= \ $APELINK