From 5d2575c627a22d104594a167b4d807b75f026e5d Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Thu, 8 May 2025 21:36:37 -0400
Subject: [PATCH] Revert "apple-sdk: add hack for C++ issues on
 `x86_64-darwin`"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 04b49f4e8d44ccd9f13b58ac4c31f8af4c28d4a1.

This workaround has a non-trivial cost in build time. Since it’s not
needed when linking against the system libc++, just drop it.
---
 .../ap/apple-sdk/common/process-stubs.nix        | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix
index 28679553b7bf..88ebf23ee273 100644
--- a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix
@@ -36,21 +36,5 @@ self: super: {
       llvm-readtapi --filetype=tbd-v4 usr/lib/$libSystem~ -o usr/lib/$libSystem
       rm usr/lib/$libSystem~
     done
-
-    # Strip weak C++ symbols to work around `libc++` leakage in system
-    # frameworks for now. These are only present on `x86_64-darwin`, so
-    # it should hopefully be harmless.
-    #
-    # TODO FIXME: This is kind of horrible.
-    while read -r -d "" stub; do
-      printf 'Stripping weak C++ symbols from %s\n' "$stub"
-      llvm-readtapi --filetype=tbd-v5 "$stub" \
-      | jq '
-        (.main_library, .libraries[]?).exported_symbols[]?.data.weak[]? |=
-          select(startswith("__Z") | not)
-      ' > $stub~
-      llvm-readtapi --filetype=tbd-v4 $stub~ -o $stub
-      rm $stub~
-    done < <(find . -name '*.tbd' -print0)
   '';
 }