ld64: search standard library locations

This is basically harmless for the same reason as it is for Clang, and
lets us avoid doing wrapper hacks to fix things like the .NET build.

This reverts commit 4340a5a.

pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh

@@ -85,13 +85,3 @@ mangleVarSingle DEVELOPER_DIR ${role_suffixes[@]+"${role_suffixes[@]}"}
 # Allow wrapped bintools to do something useful when no `DEVELOPER_DIR` is set, which can happen when
 # the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set.
 DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@}
-
-# Darwin looks for frameworks in the SDK located at `DEVELOPER_DIR`.
-extraBefore+=("-F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks")
-extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib")
-
-# While the Swift wrapper should take care of this, anything that needs to link Swift auto-linked frameworks
-# also needs these paths. Note: Test and conditionally add it because the path may not exist in older SDKs.
-if [ -d "$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/swift" ]; then
-    extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/swift")
-fi

pkgs/by-name/ld/ld64/package.nix

@@ -128,8 +128,6 @@ stdenv.mkDerivation (finalAttrs: {
     ./0006-Add-libcd_is_blob_a_linker_signature-implementation.patch
     # Add OpenSSL implementation of CoreCrypto digest functions. Avoids use of private and non-free APIs.
     ./0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
-    # ld64 will search `/usr/lib`, `/Library/Frameworks`, etc by default. Disable that.
-    ./0008-Disable-searching-in-standard-library-locations.patch
   ];
 
   postPatch = ''

pkgs/stdenv/darwin/default.nix

@@ -453,9 +453,15 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
 
               bintools = selfDarwin.binutils-unwrapped;
 
-              # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly.
+              # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly,
+              # and additional linker flags to work around a since‐removed patch.
               # This can be dropped once the bootstrap tools cctools has been updated to 1010.6.
               extraBuildCommands = ''
+                printf %s ${lib.escapeShellArg ''
+                  extraBefore+=("-F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks")
+                  extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib")
+                ''} >> $out/nix-support/add-darwin-ldflags-before.sh
+
                 echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook
 
                 export signingUtils=${selfDarwin.signingUtils}