From fa66484051cf96af1556dcfa901d91e1d71d04b0 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Sat, 8 Feb 2025 12:21:01 -0500 Subject: [PATCH] prefer system ape --- tool/cosmocc/package.sh | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/tool/cosmocc/package.sh b/tool/cosmocc/package.sh index b66cfbde4..51450e94e 100755 --- a/tool/cosmocc/package.sh +++ b/tool/cosmocc/package.sh @@ -40,19 +40,21 @@ fi $MAKE -j$NPROC m= \ $APELINK -case $(uname -s) in - Darwin) - case $(mode) in - aarch64) - cc -O -o "$TMPDIR/ape.$$" .cosmocc/current/bin/ape-m1.c || exit - trap 'rm "$TMPDIR/ape.$$"' EXIT - APE=$TMPDIR/ape.$$ +if ! APE=$(command -v ape); then + case $(uname -s) in + Darwin) + case $(mode) in + aarch64) + cc -O -o "$TMPDIR/ape.$$" .cosmocc/current/bin/ape-m1.c || exit + trap 'rm "$TMPDIR/ape.$$"' EXIT + APE=$TMPDIR/ape.$$ + ;; + *) APE=.cosmocc/current/bin/ape-x86_64.macho ;; + esac ;; - *) APE=.cosmocc/current/bin/ape-x86_64.macho ;; - esac - ;; - *) APE=.cosmocc/current/bin/ape-$(uname -m).elf ;; -esac + *) APE=.cosmocc/current/bin/ape-$(uname -m).elf ;; + esac +fi stat $APE $MAKE -j$NPROC m=$AMD64 \