godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add arch flag to assembler to fix build on ARM64 macOS / iOS.

Browse Source 
(cherry picked from commit b767d2e0fd)
This commit is contained in:
bruvzg
2022-07-01 11:29:21 +03:00
committed by Rémi Verschelde
parent bda382684f
commit b7c9eb1a3c
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/SCsub
View File

@@ -134,9 +134,8 @@ if env["builtin_zstd"]:
"decompress/zstd_decompress_block.c",
"decompress/zstd_decompress.c",
]
if env["platform"] in ["android", "osx", "server", "x11"]:
if env["platform"] in ["android", "iphone", "osx", "server", "x11"]:
# Match platforms with ZSTD_ASM_SUPPORTED in common/portability_macros.h
# iOS x86_64 should be supported in theory, but it fails arm64 build, seems to use host S_compiler.
thirdparty_zstd_sources.append("decompress/huf_decompress_amd64.S")
thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources]