From 587f9f7bcdf7c5672d006b841e2d276c6cba27d9 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 31 Oct 2022 19:25:47 +0100 Subject: [PATCH] makepanda: Fix issues when building on arm64 without `--arch` flag Logic in various places seems to assume `OSX_ARCHS` contains `arm64` in this case --- makepanda/makepanda.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index c7d2c5d309..5034f88dab 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -338,6 +338,9 @@ def parseopts(args): if 'arm64' in target_archs and OSXTARGET and OSXTARGET < (10, 9): exit("Must have at least --osxtarget 10.9 when targeting arm64") + elif platform.machine() == 'arm64': + OSX_ARCHS = ('arm64',) + try: SetOptimize(int(optimize)) assert GetOptimize() in [1, 2, 3, 4]