@@ -44,24 +44,6 @@ common --flag_alias=host_swiftcopt=@rules_swift//swift:exec_copt
 build:macos --swiftcopt=-target --swiftcopt=arm64-apple-macosx10.15
 build:macos --host_swiftcopt=-target --host_swiftcopt=arm64-apple-macosx10.15
 
-# Disable `swift-autolink-extract` on macOS.
-#
-# rules_swift 4.0.0-rc4's standalone toolchain template
-# (`swift/internal/extensions/BUILD.bazel.tpl`) unconditionally hardcodes
-# `swift.use_autolink_extract` into the exec `swift_toolchain(...)` features
-# list — even for macOS. That schedules a `SwiftAutolinkExtract` action for
-# every `swift_library` (e.g. `@swift-syntax//:SwiftSyntax601`). But
-# `swift-autolink-extract` is a Linux/ELF-only workflow: on macOS the Apple
-# linker handles autolinking natively via `LC_LINKER_OPTION`, and running the
-# tool from a swift.org standalone toolchain against Mach-O `.o` files fails
-# with an opaque "worker failed" error.
-#
-# Negating the feature on the command line flips
-# `SWIFT_FEATURE_USE_AUTOLINK_EXTRACT in ctx.features` to `False` in
-# `swift_toolchain.bzl`, so the autolink-extract tool config (and therefore
-# the action) is never registered on macOS. The Linux exec toolchain is
-# unaffected.
-build:macos --features=-swift.use_autolink_extract
 # Disable Android SDK auto-detection (we don't use it, and rules_android has Bazel 9 compatibility issues)
 build --repo_env=ANDROID_HOME=
 
 
@@ -34,18 +34,6 @@ bazel_dep(name = "rules_rust", version = "0.69.0")
 bazel_dep(name = "rules_swift", version = "4.0.0-rc4")
 bazel_dep(name = "swift-syntax", version = "602.0.0.bcr.2")
 
-# rules_swift 4.0.0-rc4's standalone toolchain extension unconditionally
-# emits Linux/ELF-only linker flags (swiftrt.o, -lstdc++, -lrt, -ldl,
-# -static-libgcc) for its macOS toolchain, which breaks any binary linked
-# via `swift_library` on macOS. Apply a local patch that skips those flags
-# when the toolchain OS is macos. See the patch header and
-# `misc/bazel/patches/rules_swift/macos-linkopts.patch` for details.
-single_version_override(
-    module_name = "rules_swift",
-    patch_strip = 1,
-    patches = ["//misc/bazel/patches/rules_swift:macos-linkopts.patch"],
-    version = "4.0.0-rc4",
-)
 bazel_dep(name = "zstd", version = "1.5.7.bcr.1")
 
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
@@ -239,16 +227,28 @@ use_repo(
 # `rules_swift` standalone-toolchain extension and is independent of the
 # patched prebuilt toolchain wired up via `swift_deps` above.
 #
-# Bazel cannot auto-select between Linux distributions, so the toolchain is
-# registered explicitly for the distributions/platforms our CI runs on:
-#   - ubuntu24.04 / x86_64  (Linux CI)
-#   - xcode                  (macOS CI — covers both Apple Silicon and Intel)
+# We register the `exec` toolchain for **Linux only**. On macOS we do NOT
+# use this standalone toolchain: it is the Unix-shaped `swift_toolchain`
+# rule (`swift/toolchains/swift_toolchain.bzl`) which emits Linux/ELF
+# linkopts (`swiftrt.o`, `-lstdc++`, `-lrt`, `-ldl`, `-static-libgcc`) and
+# a Linux-shaped `-L{root}/lib/swift/{os}` search path — none of which make
+# sense on macOS. Instead, on macOS we rely on rules_swift's auto-registered
+# `@rules_swift//swift/toolchains:xcode-toolchain-*` toolchains (backed by
+# `xcode_swift_toolchain.bzl`, which has its own macOS-aware
+# `_swift_linkopts_cc_info` that uses the Apple linker's autolinking,
+# points at `Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx`,
+# and rpaths the OS-provided `/usr/lib/swift`). Those toolchains are
+# auto-registered by rules_swift's own MODULE.bazel via
+# `register_toolchains("//swift/toolchains:all")` and use the Xcode
+# selected on the host, so macOS contributors need a working Xcode
+# (or Command Line Tools) install.
 #
-# NOTE: The macOS toolchain is distributed as a `.pkg` archive that can only
-# be extracted on a macOS host. Do not build the `xcode` toolchain on Linux.
+# NOTE: The macOS standalone toolchain is distributed as a `.pkg` archive
+# that can only be extracted on a macOS host. Do not build the `xcode`
+# standalone toolchain on Linux.
 #
-# We register the `exec` toolchains (normal host compilation) rather than the
-# `embedded` ones, which target `os:none` (Embedded Swift) and would not
+# We register the `exec` toolchain (normal host compilation) rather than the
+# `embedded` one, which targets `os:none` (Embedded Swift) and would not
 # match a normal host build. Bazel selects the toolchain matching the host
 # platform automatically.
 #
@@ -264,12 +264,10 @@ use_repo(
     swift,
     "swift_toolchain",
     "swift_toolchain_ubuntu24.04",
-    "swift_toolchain_xcode",
 )
 
 register_toolchains(
     "@swift_toolchain//:swift_toolchain_exec_ubuntu24.04",
-    "@swift_toolchain//:swift_toolchain_exec_xcode",
 )
 
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 
@@ -59,12 +59,13 @@ rust_binary(
     # The Swift toolchain propagates a runfiles-relative RPATH to its runtime
     # `.so`s/`.dylib`s via `swift_syntax_ffi`'s `CcInfo`, but (unlike
     # `swift_binary`) `rust_binary` does not copy those libraries into runfiles.
-    # Add the toolchain files as `data` so the runtime is found at execution
-    # time. (rules_swift does not yet support statically linking the runtime.)
-    # Select the correct per-platform toolchain repo: `xcode` on macOS,
-    # `ubuntu24.04` on Linux.
+    # On Linux the standalone swift.org toolchain provides the runtime, so we
+    # add its files as `data` so the runtime is found at execution time.
+    # On macOS the runtime lives in the OS at `/usr/lib/swift` (which
+    # `xcode_swift_toolchain` rpaths automatically), so no data is needed.
+    # (rules_swift does not yet support statically linking the runtime.)
     data = select({
-        "@platforms//os:macos": ["@swift_toolchain_xcode//:files"],
+        "@platforms//os:macos": [],
         "@platforms//os:linux": ["@swift_toolchain_ubuntu24.04//:files"],
     }),
     edition = "2024",
@@ -77,7 +78,7 @@ rust_test(
     size = "small",
     crate = ":swift_syntax_rs",
     data = select({
-        "@platforms//os:macos": ["@swift_toolchain_xcode//:files"],
+        "@platforms//os:macos": [],
         "@platforms//os:linux": ["@swift_toolchain_ubuntu24.04//:files"],
     }),
     edition = "2024",