From b767d2e0fdf835dc181bb21c8be69a35671b60b8 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Fri, 1 Jul 2022 11:29:21 +0300
Subject: [PATCH] Add arch flag to assembler to fix build on ARM64 macOS / iOS.

---
 core/SCsub                | 3 +--
 platform/iphone/detect.py | 4 ++++
 platform/osx/detect.py    | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/SCsub b/core/SCsub
index 3814c728779..df3e7a547aa 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -129,9 +129,8 @@ if env["builtin_zstd"]:
         "decompress/zstd_decompress_block.c",
         "decompress/zstd_decompress.c",
     ]
-    if env["platform"] in ["android", "linuxbsd", "osx"]:
+    if env["platform"] in ["android", "iphone", "linuxbsd", "osx"]:
         # 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]
 
diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py
index 392a0151bec..862f1fe50b4 100644
--- a/platform/iphone/detect.py
+++ b/platform/iphone/detect.py
@@ -98,10 +98,12 @@ def configure(env):
 
     if env["ios_simulator"]:
         detect_darwin_sdk_path("iphonesimulator", env)
+        env.Append(ASFLAGS=["-mios-simulator-version-min=13.0"])
         env.Append(CCFLAGS=["-mios-simulator-version-min=13.0"])
         env.extra_suffix = ".simulator" + env.extra_suffix
     else:
         detect_darwin_sdk_path("iphone", env)
+        env.Append(ASFLAGS=["-miphoneos-version-min=11.0"])
         env.Append(CCFLAGS=["-miphoneos-version-min=11.0"])
 
     if env["arch"] == "x86_64":
@@ -113,6 +115,7 @@ def configure(env):
                 " -fasm-blocks -isysroot $IPHONESDK"
             ).split()
         )
+        env.Append(ASFLAGS=["-arch", "x86_64"])
     elif env["arch"] == "arm64":
         env.Append(
             CCFLAGS=(
@@ -122,6 +125,7 @@ def configure(env):
                 " -isysroot $IPHONESDK".split()
             )
         )
+        env.Append(ASFLAGS=["-arch", "arm64"])
         env.Append(CPPDEFINES=["NEED_LONG_INT"])
 
     # Disable exceptions on non-tools (template) builds
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 8d848d2094e..67c2b9af7a3 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -79,10 +79,12 @@ def configure(env):
 
     if env["arch"] == "arm64":
         print("Building for macOS 11.0+, platform arm64.")
+        env.Append(ASFLAGS=["-arch", "arm64", "-mmacosx-version-min=11.0"])
         env.Append(CCFLAGS=["-arch", "arm64", "-mmacosx-version-min=11.0"])
         env.Append(LINKFLAGS=["-arch", "arm64", "-mmacosx-version-min=11.0"])
     else:
         print("Building for macOS 10.12+, platform x86_64.")
+        env.Append(ASFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.12"])
         env.Append(CCFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.12"])
         env.Append(LINKFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.12"])