From 1c54de6dd0cd362dec043068d762e5e247dc42d9 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Sun, 29 Dec 2024 16:21:09 -0500 Subject: [PATCH 1/2] convert cosmo exe to platform-native exes --- scripts/build_cosmo.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/build_cosmo.sh b/scripts/build_cosmo.sh index c719eb64..66365588 100755 --- a/scripts/build_cosmo.sh +++ b/scripts/build_cosmo.sh @@ -285,6 +285,19 @@ function build_python () { python3 ${WORKDIR}/scripts/patch_pip_script.py ./bin/pip3 .com python3 ${WORKDIR}/scripts/patch_pip_script.py ./bin/pip${PYTHON_VER} .com + echo "::endgroup::" + ############## + # Assimilate # + ############## + echo "::group::Assimilate python.com" + cd ${BUILDDIR} + + cd ${python_install_dir} + $(which assimilate) -e -x -o ./bin/python.x86_64.elf ./bin/python.com + $(which assimilate) -e -a -o ./bin/python.aarch64.elf ./bin/python.com + $(which assimilate) -m -x -o ./bin/python.x86_64.macho ./bin/python.com + $(which assimilate) -m -a -o ./bin/python.aarch64.macho ./bin/python.com + echo "::endgroup::" ################### # Compress output # From f65295a7158e1b12e243e875c84d18a24708022f Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Sun, 29 Dec 2024 18:37:39 -0500 Subject: [PATCH 2/2] don't assimilate for m1 macs --- scripts/build_cosmo.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/build_cosmo.sh b/scripts/build_cosmo.sh index 66365588..65a8f8e6 100755 --- a/scripts/build_cosmo.sh +++ b/scripts/build_cosmo.sh @@ -296,7 +296,9 @@ function build_python () { $(which assimilate) -e -x -o ./bin/python.x86_64.elf ./bin/python.com $(which assimilate) -e -a -o ./bin/python.aarch64.elf ./bin/python.com $(which assimilate) -m -x -o ./bin/python.x86_64.macho ./bin/python.com - $(which assimilate) -m -a -o ./bin/python.aarch64.macho ./bin/python.com + + # M1 macs should rely on xcode to compile the launcher from the embedded ape-m1.c + #$(which assimilate) -m -a -o ./bin/python.aarch64.macho ./bin/python.com echo "::endgroup::" ###################