From dac134d254bab15209e494413973e4f902b654c6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 22 Jul 2026 11:06:33 -0700
Subject: [PATCH] pkg/apple-sdk: enable libc++ availability annotations

#13417

The bundled upstream libc++ headers in Zig 0.16 skip the Apple-configured
availability setting. This causes the headers to assume every LLVM 21
ABI symbol is present in the target system libc++, producing binaries
that fail at launch on macOS versions without `std::__hash_memory`.

Enable the Apple vendor availability table for compile steps configured
by the Apple SDK helper. libc++ now selects its inline compatibility
implementation when the target system dylib does not provide the symbol.

References in the mega comment
---
 pkg/apple-sdk/build.zig | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkg/apple-sdk/build.zig b/pkg/apple-sdk/build.zig
index ba49927cf..491e23ecf 100644
--- a/pkg/apple-sdk/build.zig
+++ b/pkg/apple-sdk/build.zig
@@ -150,6 +150,30 @@ pub fn addPaths(
     step: *std.Build.Step.Compile,
 ) !void {
     const target = step.rootModuleTarget();
+
+    // A three paragraph comment to describe a single C macro. Strap in.
+    //
+    // Zig uses its own libc++ headers when compiling C++. In Zig 0.16,
+    // `__config` skips `__config_site`, the file that normally contains
+    // platform settings, and expects those settings as `-D` flags:
+    // https://codeberg.org/ziglang/zig/src/tag/0.16.0/lib/libcxx/include/__config#L13
+    //
+    // This macro enables Apple's availability checks. Without them, libc++
+    // assumes every symbol declared by these newer headers also exists in the
+    // target's runtime library:
+    // https://github.com/llvm/llvm-project/blob/llvmorg-21.1.0/libcxx/include/__configuration/availability.h#L63-L125
+    //
+    // For example, `hash.h` either calls `std::__hash_memory` from the runtime
+    // library or compiles an inline fallback:
+    // https://github.com/llvm/llvm-project/blob/llvmorg-21.1.0/libcxx/include/__functional/hash.h#L244-L250
+    // Without the checks, it chooses the runtime symbol. Older macOS versions
+    // don't have that symbol, so dyld aborts at launch:
+    // https://github.com/llvm/llvm-project/issues/155531
+    step.root_module.addCMacro(
+        "_LIBCPP_HAS_VENDOR_AVAILABILITY_ANNOTATIONS",
+        "1",
+    );
+
     switch (try pathsForTarget(b, target)) {
         .native => |native| {
             step.setLibCFile(native.libc);