From 9c15dc72a4c3285f30ea7dbc2b1d6fb2d4700d8c Mon Sep 17 00:00:00 2001
From: Rafi <mohamedrafikhan2009@gmail.com>
Date: Sun, 8 Nov 2026 11:24:49 +0000
Subject: [PATCH] Patch-up iOS Simulator's architectures logic

Co-authored-by: Karim Akra <144803230+KarimAkra@users.noreply.github.com>
---
 toolchain/finish-setup.xml        |  8 +++++---
 toolchain/iphonesim-toolchain.xml | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/toolchain/finish-setup.xml b/toolchain/finish-setup.xml
index 90f988d7..946a8f11 100644
--- a/toolchain/finish-setup.xml
+++ b/toolchain/finish-setup.xml
@@ -41,9 +41,11 @@
 
 
 
-<set name="LIBEXTRA" value=".iphonesim-64" if="iphonesim" unless="HXCPP_ARM64"/>
-<set name="LIBEXTRA" value=".iphonesim-arm64" if="iphonesim HXCPP_ARM64"/>
-<set name="LIBEXTRA" value=".iphonesim" if="iphonesim" unless="HXCPP_M64 || HXCPP_ARM64"/>
+<section if="iphonesim">
+   <set name="LIBEXTRA" value=".iphonesim" unless="HXCPP_M64 || HXCPP_ARM64"/>
+   <set name="LIBEXTRA" value=".iphonesim-64" if="HXCPP_M64" unless="HXCPP_ARM64" />
+   <set name="LIBEXTRA" value=".iphonesim-arm64" if="HXCPP_ARM64" unless="HXCPP_M64" />
+</section>
 <section if="iphoneos">
 	<set name="LIBEXTRA" value=".iphoneos-v7" if="HXCPP_ARMV7"/>
 	<set name="LIBEXTRA" value=".iphoneos-v7s" if="HXCPP_ARMV7S"/>
diff --git a/toolchain/iphonesim-toolchain.xml b/toolchain/iphonesim-toolchain.xml
index f088c85c..a2488584 100644
--- a/toolchain/iphonesim-toolchain.xml
+++ b/toolchain/iphonesim-toolchain.xml
@@ -40,13 +40,16 @@
   <flag value="-Wno-unused-variable"/>
   <flag value="-arch"/>
   <flag value="i386" unless="HXCPP_M64 || HXCPP_ARM64"/>
-  <flag value="x86_64" if="HXCPP_M64" unless="HXCPP_ARM64"/>
-  <flag value="arm64" if="HXCPP_ARM64"/>
+  <flag value="x86_64" if="HXCPP_M64" unless="HXCPP_ARM64" />
+  <flag value="arm64" if="HXCPP_ARM64" />
+  <flag value="-target" />
+  <flag value="x86_64-apple-ios-simulator" if="HXCPP_M64" unless="HXCPP_ARM64" />
+  <flag value="arm64-apple-ios-simulator" if="HXCPP_ARM64" />
   <flag value="-isysroot"/>
   <flag value="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_VER}.sdk"/>
   <!-- Removed for iOS 8 -->
   <!-- <flag value="-fvisibility=hidden"/> -->
-  <!-- <flag value="-miphoneos-version-min=${IPHONE_VER}"/> -->
+  <!-- <flag value="-mios-simulator-version-min=${IPHONE_VER}"/> -->
   <flag value="-mios-simulator-version-min=9.0" unless="HXCPP_IOS_MIN_VERSION" />
   <flag value="-mios-simulator-version-min=${HXCPP_IOS_MIN_VERSION}" if="HXCPP_IOS_MIN_VERSION" />
   <flag value="-DIPHONE=IPHONE"/>
@@ -80,8 +83,11 @@
   <flag value="-dynamiclib"/>
   <flag value="-arch"/>
   <flag value="i386" unless="HXCPP_M64 || HXCPP_ARM64"/>
-  <flag value="x86_64" if="HXCPP_M64" unless="HXCPP_ARM64"/>
-  <flag value="arm64" if="HXCPP_ARM64"/>
+  <flag value="x86_64" if="HXCPP_M64" unless="HXCPP_ARM64" />
+  <flag value="arm64" if="HXCPP_ARM64" />
+  <flag value="-target" />
+  <flag value="x86_64-apple-ios-simulator" if="HXCPP_M64" unless="HXCPP_ARM64" />
+  <flag value="arm64-apple-ios-simulator" if="HXCPP_ARM64" />
   <flag value="-isysroot"/>
   <flag value="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_VER}.sdk"/>
   <flag value="-Wl,-undefined,dynamic_lookup"/>