diff --git a/README.md b/README.md
index 768db246a..c97158e58 100644
--- a/README.md
+++ b/README.md
@@ -65,17 +65,6 @@ also ensure that the Swift compiler is available on your system path.
 Copy the `WORKSPACE` snippet from [the releases
 page](https://github.com/bazelbuild/rules_swift/releases).
 
-### 3. Additional configuration (Linux only)
-
-The `swift_binary` and `swift_test` rules expect to use `clang` as the driver
-for linking, and they query the Bazel C++ API and CROSSTOOL to determine which
-arguments should be passed to the linker. By default, the C++ toolchain used by
-Bazel is `gcc`, so Swift users on Linux need to override this by setting the
-environment variable `CC=clang` when invoking Bazel.
-
-This step is not necessary for macOS users because the Xcode toolchain always
-uses `clang`.
-
 ## Building with Custom Toolchains
 
 **macOS hosts:** You can build with a custom Swift toolchain (downloaded
diff --git a/swift/internal/swift_autoconfiguration.bzl b/swift/internal/swift_autoconfiguration.bzl
index 51efe1451..4d06d090a 100644
--- a/swift/internal/swift_autoconfiguration.bzl
+++ b/swift/internal/swift_autoconfiguration.bzl
@@ -496,9 +496,6 @@ def _swift_cc_autoconfiguration_impl(repository_ctx):
         _create_linux_cc_toolchain(repository_ctx)
 
 def _swift_autoconfiguration_impl(repository_ctx):
-    # TODO(allevato): This is expedient and fragile. Use the
-    # platforms/toolchains APIs instead to define proper toolchains, and make it
-    # possible to support non-Xcode toolchains on macOS as well.
     os_name = repository_ctx.os.name.lower()
     if os_name.startswith("mac os"):
         _create_xcode_toolchain(repository_ctx)