From 10e76a09de6c33201b79d4dae17dc1df7dc3c722 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Thu, 10 Oct 2024 21:12:31 +1100 Subject: [PATCH] Fix failing MacOS builds --- src/bonsai/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bonsai/Makefile b/src/bonsai/Makefile index 3ef3a63c3a..757bcaf0c1 100644 --- a/src/bonsai/Makefile +++ b/src/bonsai/Makefile @@ -274,11 +274,6 @@ endif # See: https://projects.blender.org/blender/blender/issues/125091 ifeq ($(PLATFORM), macosm1) - # Has universal and x86_64 builds. - prev_whl_name=$$(find build/bonsai/wheels/MarkupSafe-*.whl); \ - whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \ - mv "$$prev_whl_name" "$$whl_name"; - # Has universal and x86_64 builds. prev_whl_name=$$(find build/bonsai/wheels/lxml-*.whl); \ whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \ @@ -294,6 +289,11 @@ ifeq ($(PLATFORM), macosm1) mv "$$prev_whl_name" "$$whl_name"; endif ifeq ($(PLATFORM), macos) + # Has universal and arm64 builds. + prev_whl_name=$$(find build/bonsai/wheels/MarkupSafe-*.whl); \ + whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \ + mv "$$prev_whl_name" "$$whl_name"; + prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \ whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_x86_64/"); \ mv "$$prev_whl_name" "$$whl_name"; @@ -302,7 +302,7 @@ ifeq ($(PLATFORM), macos) whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \ mv "$$prev_whl_name" "$$whl_name"; - # has universal and amr64 builds. + # has universal and arm builds. prev_whl_name=$$(find build/bonsai/wheels/fonttools-*.whl); \ whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \ mv "$$prev_whl_name" "$$whl_name";