From 5b6318e77f3cb1fea519bbd3cd637ad9b0be1606 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 30 Oct 2024 20:56:31 +0100 Subject: [PATCH] makepanda: Don't set macOS deployment target to 10.13 except when linking with Python This prevents building for multiple Python versions in the same build [skip ci] --- makepanda/makepanda.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 2a1308771b..08c800798e 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -357,8 +357,6 @@ os.environ["MAKEPANDA"] = os.path.abspath(sys.argv[0]) if GetHost() == "darwin": if tuple(OSX_ARCHS) == ('arm64',): os.environ["MACOSX_DEPLOYMENT_TARGET"] = "11.0" - elif sys.version_info >= (3, 13): - os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.13" else: os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.9" @@ -1337,8 +1335,6 @@ def CompileCxx(obj,src,opts): if tuple(OSX_ARCHS) == ('arm64',): cmd += " -mmacosx-version-min=11.0" - elif sys.version_info >= (3, 13): - cmd += " -mmacosx-version-min=10.13" else: cmd += " -mmacosx-version-min=10.9" @@ -1876,7 +1872,7 @@ def CompileLink(dll, obj, opts): if tuple(OSX_ARCHS) == ('arm64',): cmd += " -mmacosx-version-min=11.0" - elif sys.version_info >= (3, 13): + elif sys.version_info >= (3, 13) and 'PYTHON' in opts: cmd += " -mmacosx-version-min=10.13" else: cmd += " -mmacosx-version-min=10.9"