From 219b0fe5352af2b9265b0389965aa411ad9af4b5 Mon Sep 17 00:00:00 2001
From: Harold Brenes <harold@hbrenes.com>
Date: Sun, 13 Jul 2025 15:45:21 -0400
Subject: [PATCH 1/3] Replace system:System.framework imports with
 system:System This makes the linker work for both macOS and iOS targets

---
 core/c/libc/complex.odin                | 2 +-
 core/c/libc/ctype.odin                  | 2 +-
 core/c/libc/errno.odin                  | 2 +-
 core/c/libc/locale.odin                 | 2 +-
 core/c/libc/math.odin                   | 2 +-
 core/c/libc/setjmp.odin                 | 2 +-
 core/c/libc/signal.odin                 | 2 +-
 core/c/libc/stdio.odin                  | 2 +-
 core/c/libc/stdlib.odin                 | 2 +-
 core/c/libc/string.odin                 | 2 +-
 core/c/libc/time.odin                   | 2 +-
 core/c/libc/uchar.odin                  | 2 +-
 core/c/libc/wchar.odin                  | 2 +-
 core/c/libc/wctype.odin                 | 2 +-
 core/net/interface_darwin.odin          | 2 +-
 core/os/os2/process_posix_darwin.odin   | 2 +-
 core/os/os_darwin.odin                  | 4 ++--
 core/sync/futex_darwin.odin             | 2 +-
 core/sync/primitives_darwin.odin        | 2 +-
 core/sys/darwin/Foundation/NSBlock.odin | 2 +-
 core/sys/darwin/darwin.odin             | 2 +-
 core/sys/darwin/mach_darwin.odin        | 2 +-
 core/sys/darwin/proc.odin               | 2 +-
 core/sys/kqueue/kqueue.odin             | 2 +-
 core/sys/posix/arpa_inet.odin           | 2 +-
 core/sys/posix/dirent.odin              | 2 +-
 core/sys/posix/dlfcn.odin               | 2 +-
 core/sys/posix/fcntl.odin               | 2 +-
 core/sys/posix/fnmatch.odin             | 2 +-
 core/sys/posix/glob.odin                | 2 +-
 core/sys/posix/grp.odin                 | 2 +-
 core/sys/posix/langinfo.odin            | 2 +-
 core/sys/posix/libgen.odin              | 2 +-
 core/sys/posix/monetary.odin            | 2 +-
 core/sys/posix/net_if.odin              | 2 +-
 core/sys/posix/netdb.odin               | 2 +-
 core/sys/posix/netinet_in.odin          | 2 +-
 core/sys/posix/poll.odin                | 2 +-
 core/sys/posix/pthread.odin             | 2 +-
 core/sys/posix/pwd.odin                 | 2 +-
 core/sys/posix/sched.odin               | 2 +-
 core/sys/posix/setjmp.odin              | 2 +-
 core/sys/posix/signal.odin              | 2 +-
 core/sys/posix/signal_libc.odin         | 2 +-
 core/sys/posix/stdio.odin               | 2 +-
 core/sys/posix/stdio_libc.odin          | 2 +-
 core/sys/posix/stdlib.odin              | 2 +-
 core/sys/posix/stdlib_libc.odin         | 2 +-
 core/sys/posix/string.odin              | 2 +-
 core/sys/posix/string_libc.odin         | 2 +-
 core/sys/posix/sys_ipc.odin             | 2 +-
 core/sys/posix/sys_mman.odin            | 2 +-
 core/sys/posix/sys_msg.odin             | 2 +-
 core/sys/posix/sys_resource.odin        | 2 +-
 core/sys/posix/sys_select.odin          | 2 +-
 core/sys/posix/sys_sem.odin             | 2 +-
 core/sys/posix/sys_shm.odin             | 2 +-
 core/sys/posix/sys_socket.odin          | 2 +-
 core/sys/posix/sys_stat.odin            | 2 +-
 core/sys/posix/sys_statvfs.odin         | 2 +-
 core/sys/posix/sys_time.odin            | 2 +-
 core/sys/posix/sys_times.odin           | 2 +-
 core/sys/posix/sys_uio.odin             | 2 +-
 core/sys/posix/sys_utsname.odin         | 2 +-
 core/sys/posix/sys_wait.odin            | 2 +-
 core/sys/posix/termios.odin             | 2 +-
 core/sys/posix/time.odin                | 2 +-
 core/sys/posix/ulimit.odin              | 2 +-
 core/sys/posix/unistd.odin              | 2 +-
 core/sys/posix/unistd_libc.odin         | 2 +-
 core/sys/posix/utime.odin               | 2 +-
 core/sys/posix/wordexp.odin             | 2 +-
 72 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/core/c/libc/complex.odin b/core/c/libc/complex.odin
index 98fd7b1bb..7b6ac6417 100644
--- a/core/c/libc/complex.odin
+++ b/core/c/libc/complex.odin
@@ -5,7 +5,7 @@ package libc
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/ctype.odin b/core/c/libc/ctype.odin
index 185385a5e..d156f1ed7 100644
--- a/core/c/libc/ctype.odin
+++ b/core/c/libc/ctype.odin
@@ -3,7 +3,7 @@ package libc
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/errno.odin b/core/c/libc/errno.odin
index 5d1ca8248..138d70a80 100644
--- a/core/c/libc/errno.odin
+++ b/core/c/libc/errno.odin
@@ -5,7 +5,7 @@ package libc
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/locale.odin b/core/c/libc/locale.odin
index d95f5c164..27317526c 100644
--- a/core/c/libc/locale.odin
+++ b/core/c/libc/locale.odin
@@ -5,7 +5,7 @@ import "core:c"
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/math.odin b/core/c/libc/math.odin
index 81d51728d..d0a015c70 100644
--- a/core/c/libc/math.odin
+++ b/core/c/libc/math.odin
@@ -7,7 +7,7 @@ import "base:intrinsics"
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/setjmp.odin b/core/c/libc/setjmp.odin
index 101b614b3..4f5319316 100644
--- a/core/c/libc/setjmp.odin
+++ b/core/c/libc/setjmp.odin
@@ -5,7 +5,7 @@ package libc
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/signal.odin b/core/c/libc/signal.odin
index c447e3cc3..cddf06916 100644
--- a/core/c/libc/signal.odin
+++ b/core/c/libc/signal.odin
@@ -5,7 +5,7 @@ package libc
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/stdio.odin b/core/c/libc/stdio.odin
index 56e4e8f66..854a98637 100644
--- a/core/c/libc/stdio.odin
+++ b/core/c/libc/stdio.odin
@@ -9,7 +9,7 @@ when ODIN_OS == .Windows {
 		"system:legacy_stdio_definitions.lib",
 	}
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/stdlib.odin b/core/c/libc/stdlib.odin
index c0e273872..ca906a5f0 100644
--- a/core/c/libc/stdlib.odin
+++ b/core/c/libc/stdlib.odin
@@ -5,7 +5,7 @@ package libc
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/string.odin b/core/c/libc/string.odin
index 4ec4f3a7a..2ea54579c 100644
--- a/core/c/libc/string.odin
+++ b/core/c/libc/string.odin
@@ -7,7 +7,7 @@ import "base:runtime"
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/time.odin b/core/c/libc/time.odin
index 33f8dc3af..6106923f5 100644
--- a/core/c/libc/time.odin
+++ b/core/c/libc/time.odin
@@ -5,7 +5,7 @@ package libc
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/uchar.odin b/core/c/libc/uchar.odin
index a10969ceb..997b99b46 100644
--- a/core/c/libc/uchar.odin
+++ b/core/c/libc/uchar.odin
@@ -5,7 +5,7 @@ package libc
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/wchar.odin b/core/c/libc/wchar.odin
index f0dae720e..248611409 100644
--- a/core/c/libc/wchar.odin
+++ b/core/c/libc/wchar.odin
@@ -5,7 +5,7 @@ package libc
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/c/libc/wctype.odin b/core/c/libc/wctype.odin
index b96410b4c..6526a14e2 100644
--- a/core/c/libc/wctype.odin
+++ b/core/c/libc/wctype.odin
@@ -5,7 +5,7 @@ package libc
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/net/interface_darwin.odin b/core/net/interface_darwin.odin
index f189e5844..9883c10af 100644
--- a/core/net/interface_darwin.odin
+++ b/core/net/interface_darwin.odin
@@ -23,7 +23,7 @@ package net
 import "core:strings"
 import "core:sys/posix"
 
-foreign import lib "system:System.framework"
+foreign import lib "system:System"
 
 @(private)
 _enumerate_interfaces :: proc(allocator := context.allocator) -> (interfaces: []Network_Interface, err: Interfaces_Error) {
diff --git a/core/os/os2/process_posix_darwin.odin b/core/os/os2/process_posix_darwin.odin
index ac2d4b78c..7625e513a 100644
--- a/core/os/os2/process_posix_darwin.odin
+++ b/core/os/os2/process_posix_darwin.odin
@@ -10,7 +10,7 @@ import "core:sys/posix"
 import "core:sys/unix"
 import "core:time"
 
-foreign import lib "system:System.framework"
+foreign import lib "system:System"
 
 foreign lib {
 	sysctl :: proc(
diff --git a/core/os/os_darwin.odin b/core/os/os_darwin.odin
index 18f80623d..1010d27a8 100644
--- a/core/os/os_darwin.odin
+++ b/core/os/os_darwin.odin
@@ -1,8 +1,8 @@
 package os
 
 foreign import dl   "system:dl"
-foreign import libc "system:System.framework"
-foreign import pthread "system:System.framework"
+foreign import libc "system:System"
+foreign import pthread "system:System"
 
 import "base:runtime"
 import "core:strings"
diff --git a/core/sync/futex_darwin.odin b/core/sync/futex_darwin.odin
index 10ff7bfbb..2b104fed6 100644
--- a/core/sync/futex_darwin.odin
+++ b/core/sync/futex_darwin.odin
@@ -6,7 +6,7 @@ import "core:c"
 import "core:sys/darwin"
 import "core:time"
 
-foreign import System "system:System.framework"
+foreign import System "system:System"
 
 foreign System {
 	// __ulock_wait is not available on 10.15
diff --git a/core/sync/primitives_darwin.odin b/core/sync/primitives_darwin.odin
index 141cea744..4ae4b7789 100644
--- a/core/sync/primitives_darwin.odin
+++ b/core/sync/primitives_darwin.odin
@@ -5,7 +5,7 @@ package sync
 import "core:c"
 import "base:intrinsics"
 
-foreign import pthread "system:System.framework"
+foreign import pthread "system:System"
 
 _current_thread_id :: proc "contextless" () -> int {
 	tid: u64
diff --git a/core/sys/darwin/Foundation/NSBlock.odin b/core/sys/darwin/Foundation/NSBlock.odin
index 1ef5e8a9b..8e65391f4 100644
--- a/core/sys/darwin/Foundation/NSBlock.odin
+++ b/core/sys/darwin/Foundation/NSBlock.odin
@@ -62,7 +62,7 @@ global_block_descriptor := Block_Descriptor{
 	size     = size_of(Internal_Block_Literal),
 }
 
-foreign import libSystem "system:System.framework"
+foreign import libSystem "system:System"
 foreign libSystem {
 	_NSConcreteGlobalBlock: intrinsics.objc_class
 	_NSConcreteStackBlock: intrinsics.objc_class
diff --git a/core/sys/darwin/darwin.odin b/core/sys/darwin/darwin.odin
index 96cfc7be6..52297505a 100644
--- a/core/sys/darwin/darwin.odin
+++ b/core/sys/darwin/darwin.odin
@@ -4,7 +4,7 @@ package darwin
 import "core:c"
 
 @(export)
-foreign import system "system:System.framework"
+foreign import system "system:System"
 
 Bool :: b8
 
diff --git a/core/sys/darwin/mach_darwin.odin b/core/sys/darwin/mach_darwin.odin
index 2cc823e69..4e4ed6796 100644
--- a/core/sys/darwin/mach_darwin.odin
+++ b/core/sys/darwin/mach_darwin.odin
@@ -1,6 +1,6 @@
 package darwin
 
-foreign import mach "system:System.framework"
+foreign import mach "system:System"
 
 import "core:c"
 import "base:intrinsics"
diff --git a/core/sys/darwin/proc.odin b/core/sys/darwin/proc.odin
index fa5391f6f..ccd05f478 100644
--- a/core/sys/darwin/proc.odin
+++ b/core/sys/darwin/proc.odin
@@ -4,7 +4,7 @@ import "base:intrinsics"
 
 import "core:sys/posix"
 
-foreign import lib "system:System.framework"
+foreign import lib "system:System"
 
 // Incomplete bindings to the proc API on MacOS, add to when needed.
 
diff --git a/core/sys/kqueue/kqueue.odin b/core/sys/kqueue/kqueue.odin
index 56be1cf7a..25ee9bdce 100644
--- a/core/sys/kqueue/kqueue.odin
+++ b/core/sys/kqueue/kqueue.odin
@@ -2,7 +2,7 @@
 package kqueue
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/arpa_inet.odin b/core/sys/posix/arpa_inet.odin
index ac850ed49..6edb9e535 100644
--- a/core/sys/posix/arpa_inet.odin
+++ b/core/sys/posix/arpa_inet.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else when ODIN_OS == .Haiku {
 	foreign import lib "system:network"
 } else {
diff --git a/core/sys/posix/dirent.odin b/core/sys/posix/dirent.odin
index 1394f6b9e..cf15dada4 100644
--- a/core/sys/posix/dirent.odin
+++ b/core/sys/posix/dirent.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/dlfcn.odin b/core/sys/posix/dlfcn.odin
index 378c95c32..6c96b0079 100644
--- a/core/sys/posix/dlfcn.odin
+++ b/core/sys/posix/dlfcn.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else when ODIN_OS == .FreeBSD || ODIN_OS == .NetBSD {
 	foreign import lib "system:dl"
 } else {
diff --git a/core/sys/posix/fcntl.odin b/core/sys/posix/fcntl.odin
index bc0b5b5ba..db095c418 100644
--- a/core/sys/posix/fcntl.odin
+++ b/core/sys/posix/fcntl.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/fnmatch.odin b/core/sys/posix/fnmatch.odin
index 04c3d2888..efe179324 100644
--- a/core/sys/posix/fnmatch.odin
+++ b/core/sys/posix/fnmatch.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/glob.odin b/core/sys/posix/glob.odin
index fb90b7546..530481587 100644
--- a/core/sys/posix/glob.odin
+++ b/core/sys/posix/glob.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/grp.odin b/core/sys/posix/grp.odin
index 3694308a0..8e8e69fc2 100644
--- a/core/sys/posix/grp.odin
+++ b/core/sys/posix/grp.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/langinfo.odin b/core/sys/posix/langinfo.odin
index 1fddfe280..195de650d 100644
--- a/core/sys/posix/langinfo.odin
+++ b/core/sys/posix/langinfo.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/libgen.odin b/core/sys/posix/libgen.odin
index 2354bf70d..aa2effd72 100644
--- a/core/sys/posix/libgen.odin
+++ b/core/sys/posix/libgen.odin
@@ -2,7 +2,7 @@
 package posix
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/monetary.odin b/core/sys/posix/monetary.odin
index a444bff09..2e4105881 100644
--- a/core/sys/posix/monetary.odin
+++ b/core/sys/posix/monetary.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/net_if.odin b/core/sys/posix/net_if.odin
index 774d11b72..182a049d1 100644
--- a/core/sys/posix/net_if.odin
+++ b/core/sys/posix/net_if.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/netdb.odin b/core/sys/posix/netdb.odin
index ff1cb9d4c..f2f83875f 100644
--- a/core/sys/posix/netdb.odin
+++ b/core/sys/posix/netdb.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/netinet_in.odin b/core/sys/posix/netinet_in.odin
index ec05915de..4b74b87f0 100644
--- a/core/sys/posix/netinet_in.odin
+++ b/core/sys/posix/netinet_in.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/poll.odin b/core/sys/posix/poll.odin
index 44ec767a6..a9e582b51 100644
--- a/core/sys/posix/poll.odin
+++ b/core/sys/posix/poll.odin
@@ -6,7 +6,7 @@ import "base:intrinsics"
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/pthread.odin b/core/sys/posix/pthread.odin
index 36a3cd7b3..c7255baa3 100644
--- a/core/sys/posix/pthread.odin
+++ b/core/sys/posix/pthread.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else when ODIN_OS == .FreeBSD || ODIN_OS == .NetBSD || ODIN_OS == .Linux {
 	foreign import lib "system:pthread"
 } else {
diff --git a/core/sys/posix/pwd.odin b/core/sys/posix/pwd.odin
index 75d15c899..c3ee3c0f6 100644
--- a/core/sys/posix/pwd.odin
+++ b/core/sys/posix/pwd.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sched.odin b/core/sys/posix/sched.odin
index 82b335653..cc509ba8e 100644
--- a/core/sys/posix/sched.odin
+++ b/core/sys/posix/sched.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/setjmp.odin b/core/sys/posix/setjmp.odin
index 926dbd3ad..a26bdb93e 100644
--- a/core/sys/posix/setjmp.odin
+++ b/core/sys/posix/setjmp.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/signal.odin b/core/sys/posix/signal.odin
index 882cd9fa8..69b405c5d 100644
--- a/core/sys/posix/signal.odin
+++ b/core/sys/posix/signal.odin
@@ -6,7 +6,7 @@ import "base:intrinsics"
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/signal_libc.odin b/core/sys/posix/signal_libc.odin
index 7a054ddd7..ba0fbf084 100644
--- a/core/sys/posix/signal_libc.odin
+++ b/core/sys/posix/signal_libc.odin
@@ -9,7 +9,7 @@ import "core:c/libc"
 when ODIN_OS == .Windows {
 	foreign import lib "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/stdio.odin b/core/sys/posix/stdio.odin
index 24464dfd8..69c8ad3cb 100644
--- a/core/sys/posix/stdio.odin
+++ b/core/sys/posix/stdio.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/stdio_libc.odin b/core/sys/posix/stdio_libc.odin
index 12706970d..8ccdcc37a 100644
--- a/core/sys/posix/stdio_libc.odin
+++ b/core/sys/posix/stdio_libc.odin
@@ -10,7 +10,7 @@ when ODIN_OS == .Windows {
 		"system:legacy_stdio_definitions.lib",
 	}
 } else when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/stdlib.odin b/core/sys/posix/stdlib.odin
index 5f1ae1908..0a6e5403c 100644
--- a/core/sys/posix/stdlib.odin
+++ b/core/sys/posix/stdlib.odin
@@ -6,7 +6,7 @@ import "base:intrinsics"
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/stdlib_libc.odin b/core/sys/posix/stdlib_libc.odin
index 6574026f4..e31c51704 100644
--- a/core/sys/posix/stdlib_libc.odin
+++ b/core/sys/posix/stdlib_libc.odin
@@ -9,7 +9,7 @@ import "core:c/libc"
 when ODIN_OS == .Windows {
 	foreign import lib "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/string.odin b/core/sys/posix/string.odin
index 3f9dbb43e..3d0c5b7a2 100644
--- a/core/sys/posix/string.odin
+++ b/core/sys/posix/string.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/string_libc.odin b/core/sys/posix/string_libc.odin
index 72164cc4c..d689847ee 100644
--- a/core/sys/posix/string_libc.odin
+++ b/core/sys/posix/string_libc.odin
@@ -4,7 +4,7 @@ package posix
 when ODIN_OS == .Windows {
 	foreign import lib "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_ipc.odin b/core/sys/posix/sys_ipc.odin
index bf5938ce1..5814c7211 100644
--- a/core/sys/posix/sys_ipc.odin
+++ b/core/sys/posix/sys_ipc.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_mman.odin b/core/sys/posix/sys_mman.odin
index 0594672ae..2d51083dc 100644
--- a/core/sys/posix/sys_mman.odin
+++ b/core/sys/posix/sys_mman.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_msg.odin b/core/sys/posix/sys_msg.odin
index c578b1fc6..87d5089ea 100644
--- a/core/sys/posix/sys_msg.odin
+++ b/core/sys/posix/sys_msg.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_resource.odin b/core/sys/posix/sys_resource.odin
index ae478382a..a748c2bba 100644
--- a/core/sys/posix/sys_resource.odin
+++ b/core/sys/posix/sys_resource.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_select.odin b/core/sys/posix/sys_select.odin
index a75e58de6..117dee625 100644
--- a/core/sys/posix/sys_select.odin
+++ b/core/sys/posix/sys_select.odin
@@ -6,7 +6,7 @@ import "base:intrinsics"
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_sem.odin b/core/sys/posix/sys_sem.odin
index 069315f87..e876cf74a 100644
--- a/core/sys/posix/sys_sem.odin
+++ b/core/sys/posix/sys_sem.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_shm.odin b/core/sys/posix/sys_shm.odin
index 8f3c56b9c..8ee16e5a3 100644
--- a/core/sys/posix/sys_shm.odin
+++ b/core/sys/posix/sys_shm.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_socket.odin b/core/sys/posix/sys_socket.odin
index 0645893d0..812451219 100644
--- a/core/sys/posix/sys_socket.odin
+++ b/core/sys/posix/sys_socket.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/sys/posix/sys_stat.odin b/core/sys/posix/sys_stat.odin
index 265356e54..df0bf2b49 100644
--- a/core/sys/posix/sys_stat.odin
+++ b/core/sys/posix/sys_stat.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_statvfs.odin b/core/sys/posix/sys_statvfs.odin
index 47c810135..1a332c5ce 100644
--- a/core/sys/posix/sys_statvfs.odin
+++ b/core/sys/posix/sys_statvfs.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_time.odin b/core/sys/posix/sys_time.odin
index 94eafec85..058166759 100644
--- a/core/sys/posix/sys_time.odin
+++ b/core/sys/posix/sys_time.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_times.odin b/core/sys/posix/sys_times.odin
index 73db489a7..636d3e153 100644
--- a/core/sys/posix/sys_times.odin
+++ b/core/sys/posix/sys_times.odin
@@ -2,7 +2,7 @@
 package posix
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_uio.odin b/core/sys/posix/sys_uio.odin
index 5770f8058..b4411851b 100644
--- a/core/sys/posix/sys_uio.odin
+++ b/core/sys/posix/sys_uio.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/core/sys/posix/sys_utsname.odin b/core/sys/posix/sys_utsname.odin
index 5ea8807a7..61f88b584 100644
--- a/core/sys/posix/sys_utsname.odin
+++ b/core/sys/posix/sys_utsname.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/sys_wait.odin b/core/sys/posix/sys_wait.odin
index d3bcdfddd..e12fcd212 100644
--- a/core/sys/posix/sys_wait.odin
+++ b/core/sys/posix/sys_wait.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/termios.odin b/core/sys/posix/termios.odin
index 4ca884e87..b385b7097 100644
--- a/core/sys/posix/termios.odin
+++ b/core/sys/posix/termios.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/time.odin b/core/sys/posix/time.odin
index 88f0153f4..7d55cf15b 100644
--- a/core/sys/posix/time.odin
+++ b/core/sys/posix/time.odin
@@ -5,7 +5,7 @@ import "core:c"
 import "core:c/libc"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/ulimit.odin b/core/sys/posix/ulimit.odin
index 0f87641fa..892f6dee4 100644
--- a/core/sys/posix/ulimit.odin
+++ b/core/sys/posix/ulimit.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/unistd.odin b/core/sys/posix/unistd.odin
index b8020317c..b05f1e4fa 100644
--- a/core/sys/posix/unistd.odin
+++ b/core/sys/posix/unistd.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/unistd_libc.odin b/core/sys/posix/unistd_libc.odin
index 74edb6862..85d019f21 100644
--- a/core/sys/posix/unistd_libc.odin
+++ b/core/sys/posix/unistd_libc.odin
@@ -6,7 +6,7 @@ import "core:c"
 when ODIN_OS == .Windows {
 	foreign import lib "system:libucrt.lib"
 } else when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/utime.odin b/core/sys/posix/utime.odin
index 98c8166d6..fca0dee59 100644
--- a/core/sys/posix/utime.odin
+++ b/core/sys/posix/utime.odin
@@ -2,7 +2,7 @@
 package posix
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }
diff --git a/core/sys/posix/wordexp.odin b/core/sys/posix/wordexp.odin
index a9e6f39a7..92d6aba40 100644
--- a/core/sys/posix/wordexp.odin
+++ b/core/sys/posix/wordexp.odin
@@ -4,7 +4,7 @@ package posix
 import "core:c"
 
 when ODIN_OS == .Darwin {
-	foreign import lib "system:System.framework"
+	foreign import lib "system:System"
 } else {
 	foreign import lib "system:c"
 }

From 0e245fb40f12f0dd4ac53cc9c535e354a0540ea6 Mon Sep 17 00:00:00 2001
From: Harold Brenes <harold@hbrenes.com>
Date: Sun, 13 Jul 2025 20:17:30 -0400
Subject: [PATCH 2/3] Updated iOS/iPhoneSimulator build support

---
 base/builtin/builtin.odin             |  2 +-
 base/runtime/core.odin                |  1 +
 base/runtime/heap_allocator_unix.odin |  2 +-
 src/build_settings.cpp                | 35 ++++++++++++-----
 src/checker.cpp                       |  7 ++--
 src/linker.cpp                        | 54 ++++++++++++++++++++++++---
 6 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/base/builtin/builtin.odin b/base/builtin/builtin.odin
index 0196e2030..af102ee0b 100644
--- a/base/builtin/builtin.odin
+++ b/base/builtin/builtin.odin
@@ -145,7 +145,7 @@ ODIN_OS_STRING                  :: ODIN_OS_STRING
 
 /*
 	An `enum` value indicating the platform subtarget, chosen using the `-subtarget` switch.
-	Possible values are: `.Default` `.iOS`, and `.Android`.
+	Possible values are: `.Default` `.iOS`, .iPhoneSimulator, and `.Android`.
 */
 ODIN_PLATFORM_SUBTARGET         :: ODIN_PLATFORM_SUBTARGET
 
diff --git a/base/runtime/core.odin b/base/runtime/core.odin
index 1dadbbf6f..6c43e6c16 100644
--- a/base/runtime/core.odin
+++ b/base/runtime/core.odin
@@ -558,6 +558,7 @@ ALL_ODIN_OS_TYPES :: Odin_OS_Types{
 	Odin_Platform_Subtarget_Type :: enum int {
 		Default,
 		iOS,
+		iPhoneSimulator
 		Android,
 	}
 */
diff --git a/base/runtime/heap_allocator_unix.odin b/base/runtime/heap_allocator_unix.odin
index d4590d2dd..f6e7ce39e 100644
--- a/base/runtime/heap_allocator_unix.odin
+++ b/base/runtime/heap_allocator_unix.odin
@@ -3,7 +3,7 @@
 package runtime
 
 when ODIN_OS == .Darwin {
-	foreign import libc "system:System.framework"
+	foreign import libc "system:System"
 } else {
 	foreign import libc "system:c"
 }
diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index ebe57bf1e..312512568 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -172,6 +172,7 @@ struct TargetMetrics {
 enum Subtarget : u32 {
 	Subtarget_Default,
 	Subtarget_iOS,
+	Subtarget_iPhoneSimulator,
 	Subtarget_Android,
 
 	Subtarget_COUNT,
@@ -180,6 +181,7 @@ enum Subtarget : u32 {
 gb_global String subtarget_strings[Subtarget_COUNT] = {
 	str_lit(""),
 	str_lit("ios"),
+	str_lit("iphonesimulator"),
 	str_lit("android"),
 };
 
@@ -1824,16 +1826,29 @@ gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subta
 		}
 	}
 
-	if (metrics->os == TargetOs_darwin && subtarget == Subtarget_iOS) {
-		switch (metrics->arch) {
-		case TargetArch_arm64:
-			bc->metrics.target_triplet = str_lit("arm64-apple-ios");
-			break;
-		case TargetArch_amd64:
-			bc->metrics.target_triplet = str_lit("x86_64-apple-ios");
-			break;
-		default:
-			GB_PANIC("Unknown architecture for darwin");
+	if (metrics->os == TargetOs_darwin) {
+		switch (subtarget) {
+			case Subtarget_iOS:
+				switch (metrics->arch) {
+				case TargetArch_arm64:
+					bc->metrics.target_triplet = str_lit("arm64-apple-ios");
+					break;
+				default:
+					GB_PANIC("Unknown architecture for -subtarget:ios");
+				}
+				break;
+			case Subtarget_iPhoneSimulator:
+				switch (metrics->arch) {
+				case TargetArch_arm64:
+					bc->metrics.target_triplet = str_lit("arm64-apple-ios-simulator");
+					break;
+				case TargetArch_amd64:
+					bc->metrics.target_triplet = str_lit("x86_64-apple-ios-simulator");
+					break;
+				default:
+					GB_PANIC("Unknown architecture for -subtarget:iphonesimulator");
+				}
+				break;
 		}
 	} else if (metrics->os == TargetOs_linux && subtarget == Subtarget_Android) {
 		switch (metrics->arch) {
diff --git a/src/checker.cpp b/src/checker.cpp
index 4ebabe004..625536caa 100644
--- a/src/checker.cpp
+++ b/src/checker.cpp
@@ -1171,9 +1171,10 @@ gb_internal void init_universal(void) {
 
 	{
 		GlobalEnumValue values[Subtarget_COUNT] = {
-			{"Default", Subtarget_Default},
-			{"iOS",     Subtarget_iOS},
-			{"Android", Subtarget_Android},
+			{"Default",         Subtarget_Default},
+			{"iOS",             Subtarget_iOS},
+			{"iPhoneSimulator", Subtarget_iPhoneSimulator},
+			{"Android",         Subtarget_Android},
 		};
 
 		auto fields = add_global_enum_type(str_lit("Odin_Platform_Subtarget_Type"), values, gb_count_of(values));
diff --git a/src/linker.cpp b/src/linker.cpp
index bf2ba6fe0..01fa7065a 100644
--- a/src/linker.cpp
+++ b/src/linker.cpp
@@ -591,7 +591,7 @@ try_cross_linking:;
 						// Do not add libc again, this is added later already, and omitted with
 						// the `-no-crt` flag, not skipping here would cause duplicate library
 						// warnings when linking on darwin and might link libc silently even with `-no-crt`.
-						if (lib == str_lit("System.framework") || lib == str_lit("c")) {
+						if (lib == str_lit("System.framework") || lib == str_lit("System") || lib == str_lit("c")) {
 							continue;
 						}
 
@@ -772,10 +772,54 @@ try_cross_linking:;
 			gbString platform_lib_str = gb_string_make(heap_allocator(), "");
 			defer (gb_string_free(platform_lib_str));
 			if (build_context.metrics.os == TargetOs_darwin) {
-				// Get the MacOSX SDK path.
+				// Get the SDK path.
 				gbString darwin_sdk_path = gb_string_make(temporary_allocator(), "");
-				if (!system_exec_command_line_app_output("xcrun --sdk macosx --show-sdk-path", &darwin_sdk_path)) {
-					darwin_sdk_path = gb_string_set(darwin_sdk_path, "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk");
+
+				char const* darwin_platform_name  = "MacOSX";
+				char const* darwin_xcrun_sdk_name = "macosx";
+				char const* darwin_min_version_id = "macosx";
+
+				// NOTE(harold): We set the clang_path to run through xcrun because otherwise it complaints about the the sysroot
+				//               being set to 'MacOSX' even though we've set the sysroot to the correct SDK (-Wincompatible-sysroot).
+				//               This is because it is likely not using the SDK's toolchain Apple Clang but another one installed in the system.
+				switch (selected_subtarget) {
+				case Subtarget_iOS:
+					darwin_platform_name  = "iPhoneOS";
+					darwin_xcrun_sdk_name = "iphoneos";
+					darwin_min_version_id = "ios";
+					clang_path            = "xcrun --sdk iphoneos clang";
+					break;
+				case Subtarget_iPhoneSimulator:
+					darwin_platform_name  = "iPhoneSimulator";
+					darwin_xcrun_sdk_name = "iphonesimulator";
+					darwin_min_version_id = "ios-simulator";
+					clang_path            = "xcrun --sdk iphonesimulator clang";
+					break;
+				}
+
+				const char* original_clang_path = original_clang_path;
+
+				gbString darwin_find_sdk_cmd = gb_string_make(temporary_allocator(), "");
+				darwin_find_sdk_cmd = gb_string_append_fmt(darwin_find_sdk_cmd, "xcrun --sdk %s --show-sdk-path", darwin_xcrun_sdk_name);
+
+				if (!system_exec_command_line_app_output(darwin_find_sdk_cmd, &darwin_sdk_path)) {
+
+					// Fallback to default clang, since `xcrun --sdk` did not work.
+					clang_path = original_clang_path;
+
+					// Best-effort fallback to known locations
+					gbString darwin_sdk_path = gb_string_make(temporary_allocator(), "");
+					darwin_sdk_path = gb_string_append_fmt(darwin_sdk_path, "/Library/Developer/CommandLineTools/SDKs/%s.sdk", darwin_platform_name);
+
+					if (!path_is_directory(make_string_c(darwin_sdk_path))) {
+						gb_string_clear(darwin_sdk_path);
+						darwin_sdk_path = gb_string_append_fmt(darwin_sdk_path, "/Applications/Xcode.app/Contents/Developer/Platforms/%s.platform/Developer/SDKs/%s.sdk", darwin_platform_name);
+
+						if (!path_is_directory(make_string_c(darwin_sdk_path))) {
+							gb_printf_err("Failed to find %s SDK\n", darwin_platform_name);
+							return -1;
+						}
+					}
 				} else {
 					// Trim the trailing newline.
 					darwin_sdk_path = gb_string_trim_space(darwin_sdk_path);
@@ -797,7 +841,7 @@ try_cross_linking:;
 				// Only specify this flag if the user has given a minimum version to target.
 				// This will cause warnings to show up for mismatched libraries.
 				if (build_context.minimum_os_version_string_given) {
-					link_settings = gb_string_append_fmt(link_settings, "-mmacosx-version-min=%.*s ", LIT(build_context.minimum_os_version_string));
+					link_settings = gb_string_append_fmt(link_settings, "-m%s-version-min=%.*s ", darwin_min_version_id, LIT(build_context.minimum_os_version_string));
 				}
 
 				if (build_context.build_mode != BuildMode_DynamicLibrary) {

From 4d2d890b4c87f3376626b88782e64f97e749eaa8 Mon Sep 17 00:00:00 2001
From: Harold Brenes <harold@hbrenes.com>
Date: Sun, 13 Jul 2025 20:29:54 -0400
Subject: [PATCH 3/3] Fix accidental incorrect assignment

---
 src/linker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linker.cpp b/src/linker.cpp
index 01fa7065a..bf7705282 100644
--- a/src/linker.cpp
+++ b/src/linker.cpp
@@ -797,7 +797,7 @@ try_cross_linking:;
 					break;
 				}
 
-				const char* original_clang_path = original_clang_path;
+				const char* original_clang_path = clang_path;
 
 				gbString darwin_find_sdk_cmd = gb_string_make(temporary_allocator(), "");
 				darwin_find_sdk_cmd = gb_string_append_fmt(darwin_find_sdk_cmd, "xcrun --sdk %s --show-sdk-path", darwin_xcrun_sdk_name);