From ae1aea07967794e1b95e3fe01b42061b5a1ff8f4 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Fri, 7 Feb 2025 20:38:25 -0500 Subject: [PATCH] update APE handling --- tool/cosmocc/package.sh | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/tool/cosmocc/package.sh b/tool/cosmocc/package.sh index 74c0b32e9..efb7402d8 100755 --- a/tool/cosmocc/package.sh +++ b/tool/cosmocc/package.sh @@ -31,22 +31,6 @@ which_make() { TMPDIR=${TMPDIR:-/tmp} -which_ape() { - 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 - echo $TMPDIR/ape.$$ - ;; - *) echo .cosmocc/current/bin/ape-x86_64.macho ;; - esac - ;; - *) echo .cosmocc/current/bin/ape-$(uname -m).elf ;; - esac -} - OUTDIR=${1:-cosmocc} APELINK=o/$(mode)/tool/build/apelink AMD64=${2:-x86_64} @@ -58,8 +42,20 @@ MAKE=$(which_make) $MAKE -j$NPROC m= \ $APELINK -APE=$(which_ape) -$APE +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-$(uname -m).elf ;; +esac +stat $APE $MAKE -j$NPROC m=$AMD64 \ o/cosmocc.h.txt \