diff --git a/doc/man/pdecrypt.1 b/doc/man/pdecrypt.1 deleted file mode 120000 index cafeec2fb0..0000000000 --- a/doc/man/pdecrypt.1 +++ /dev/null @@ -1 +0,0 @@ -pencrypt.1 \ No newline at end of file diff --git a/doc/man/pdecrypt.1 b/doc/man/pdecrypt.1 new file mode 100644 index 0000000000..cafeec2fb0 --- /dev/null +++ b/doc/man/pdecrypt.1 @@ -0,0 +1 @@ +pencrypt.1 \ No newline at end of file diff --git a/doc/man/punzip.1 b/doc/man/punzip.1 deleted file mode 120000 index 93e1901659..0000000000 --- a/doc/man/punzip.1 +++ /dev/null @@ -1 +0,0 @@ -pzip.1 \ No newline at end of file diff --git a/doc/man/punzip.1 b/doc/man/punzip.1 new file mode 100644 index 0000000000..93e1901659 --- /dev/null +++ b/doc/man/punzip.1 @@ -0,0 +1 @@ +pzip.1 \ No newline at end of file diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index ef61e39171..5b0ccfed96 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2527,6 +2527,13 @@ def WriteConfigSettings(): # If we don't have mimalloc, use DeletedBufferChain as fallback, # which is still more efficient than malloc. dtool_config["USE_DELETED_CHAIN"] = '1' + # this will resolve a crash on apple silicon systems + elif GetTarget() == 'darwin': + # check for system architecture arm64 + if os.uname().machine == 'arm64': + dtool_config["USE_DELETED_CHAIN"] = '1' + else: + dtool_config["USE_DELETED_CHAIN"] = 'UNDEF' else: # On other systems, the default malloc seems to be fine. dtool_config["USE_DELETED_CHAIN"] = 'UNDEF'