diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index ee631894..b0d2be96 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -344,7 +344,7 @@
     "//cc/toolchains/yocto_generic:yocto_generic_extension.bzl%yocto_generic_extension": {
       "general": {
         "bzlTransitiveDigest": "Q4v/HN5Wh/W0JsPpeExQzSqIslfepuWsd75kvW+25FI=",
-        "usagesDigest": "xD6mwzfBp1P+bxuzyTiD6cabDa/oje/OCCqi3rsiOmE=",
+        "usagesDigest": "nSI66VIQzuf2qIL6ZKsJd2f5KY34kHbBT6Wj3PGjtYA=",
         "recordedFileInputs": {},
         "recordedDirentsInputs": {},
         "envVariables": {},
diff --git a/cc/BUILD.bazel b/cc/BUILD.bazel
index 116c6912..d914840c 100644
--- a/cc/BUILD.bazel
+++ b/cc/BUILD.bazel
@@ -206,15 +206,6 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
-config_setting(
-    name = "_enable_bzlmod_not_libcpp",
-    flag_values = {
-        ":enable_bzlmod": "true",
-        ":use_libcpp": "false",
-    },
-    visibility = ["//visibility:public"],
-)
-
 py_binary(
     name = "fix_include_guards",
     srcs = [
diff --git a/cc/toolchains/llvm/aarch64-darwin/BUILD.bazel b/cc/toolchains/llvm/aarch64-darwin/BUILD.bazel
index 0b66795c..d064422d 100644
--- a/cc/toolchains/llvm/aarch64-darwin/BUILD.bazel
+++ b/cc/toolchains/llvm/aarch64-darwin/BUILD.bazel
@@ -118,7 +118,7 @@ cc_toolchain_config(
         "strip": "wrappers/llvm-strip",
     },
     toolchain_identifier = "clang-aarch64-darwin",
-    toolchain_path_prefix = "external/aarch64-darwin-llvm",
+    toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-darwin-llvm",
     use_lld = False,
 )
 
diff --git a/cc/toolchains/llvm/aarch64-linux/BUILD.bazel b/cc/toolchains/llvm/aarch64-linux/BUILD.bazel
index 5c63a885..5c22c0f6 100644
--- a/cc/toolchains/llvm/aarch64-linux/BUILD.bazel
+++ b/cc/toolchains/llvm/aarch64-linux/BUILD.bazel
@@ -117,9 +117,7 @@ cc_toolchain_config(
     abi_version = "clang",
     builtin_sysroot = select({
         "@rules_swiftnav//cc:_use_libcpp": None,
-        # When bzlmod is enabled but libcpp is not, use the bzlmod path
-        "@rules_swiftnav//cc:_enable_bzlmod_not_libcpp": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
-        "//conditions:default": "external/aarch64-sysroot",
+        "//conditions:default": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
     }),
     compiler = "clang",
     cxx_builtin_include_directories = select({
@@ -148,7 +146,7 @@ cc_toolchain_config(
         "strip": "wrappers/llvm-strip",
     },
     toolchain_identifier = "clang-aarch64-linux",
-    toolchain_path_prefix = "external/aarch64-linux-llvm",
+    toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-linux-llvm",
 )
 
 cc_toolchain(
diff --git a/cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel b/cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel
index 2be25a5e..47a03674 100644
--- a/cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel
+++ b/cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel
@@ -103,9 +103,7 @@ cc_toolchain_config(
     abi_version = "clang",
     builtin_sysroot = select({
         "@rules_swiftnav//cc:_use_libcpp": None,
-        # When bzlmod is enabled but libcpp is not, use the bzlmod path
-        "@rules_swiftnav//cc:_enable_bzlmod_not_libcpp": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
-        "//conditions:default": "external/aarch64-sysroot",
+        "//conditions:default": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
     }),
     compiler = "clang",
     cxx_builtin_include_directories = [
@@ -134,7 +132,7 @@ cc_toolchain_config(
         "strip": "wrappers/llvm-strip",
     },
     toolchain_identifier = "clang-x86_64-linux",
-    toolchain_path_prefix = "external/x86_64-linux-llvm",
+    toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-llvm",
 )
 
 cc_toolchain(
diff --git a/cc/toolchains/llvm/x86_64-darwin/BUILD.bazel b/cc/toolchains/llvm/x86_64-darwin/BUILD.bazel
index e6fb65da..b48e4fbf 100644
--- a/cc/toolchains/llvm/x86_64-darwin/BUILD.bazel
+++ b/cc/toolchains/llvm/x86_64-darwin/BUILD.bazel
@@ -119,7 +119,7 @@ cc_toolchain_config(
         "strip": "wrappers/llvm-strip",
     },
     toolchain_identifier = "clang-x86_64-darwin",
-    toolchain_path_prefix = "external/x86_64-darwin-llvm",
+    toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-darwin-llvm",
 )
 
 cc_toolchain(
diff --git a/cc/toolchains/llvm/x86_64-linux/BUILD.bazel b/cc/toolchains/llvm/x86_64-linux/BUILD.bazel
index bfc386c8..27ee4488 100644
--- a/cc/toolchains/llvm/x86_64-linux/BUILD.bazel
+++ b/cc/toolchains/llvm/x86_64-linux/BUILD.bazel
@@ -117,9 +117,7 @@ cc_toolchain_config(
     abi_version = "clang",
     builtin_sysroot = select({
         "@rules_swiftnav//cc:_use_libcpp": None,
-        # When bzlmod is enabled but libcpp is not, use the bzlmod path
-        "@rules_swiftnav//cc:_enable_bzlmod_not_libcpp": "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-sysroot",
-        "//conditions:default": "external/x86_64-sysroot",
+        "//conditions:default": "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-sysroot",
     }),
     compiler = "clang",
     cxx_builtin_include_directories = select({
@@ -148,7 +146,7 @@ cc_toolchain_config(
         "strip": "wrappers/llvm-strip",
     },
     toolchain_identifier = "clang-x86_64-linux",
-    toolchain_path_prefix = "external/x86_64-linux-llvm",
+    toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-llvm",
 )
 
 cc_toolchain(
diff --git a/cc/toolchains/llvm20/aarch64-darwin/BUILD.bazel b/cc/toolchains/llvm20/aarch64-darwin/BUILD.bazel
index 34980fe0..66fc17e4 100644
--- a/cc/toolchains/llvm20/aarch64-darwin/BUILD.bazel
+++ b/cc/toolchains/llvm20/aarch64-darwin/BUILD.bazel
@@ -118,7 +118,7 @@ cc_toolchain_config(
         "strip": "wrappers/llvm-strip",
     },
     toolchain_identifier = "clang-aarch64-darwin",
-    toolchain_path_prefix = "external/aarch64-darwin-llvm20",
+    toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-darwin-llvm20",
     use_lld = False,
 )
 
diff --git a/cc/toolchains/llvm20/aarch64-linux/BUILD.bazel b/cc/toolchains/llvm20/aarch64-linux/BUILD.bazel
index 1f13efd1..f6ed319d 100644
--- a/cc/toolchains/llvm20/aarch64-linux/BUILD.bazel
+++ b/cc/toolchains/llvm20/aarch64-linux/BUILD.bazel
@@ -117,9 +117,7 @@ cc_toolchain_config(
     abi_version = "clang",
     builtin_sysroot = select({
         "@rules_swiftnav//cc:_use_libcpp": None,
-        # When bzlmod is enabled but libcpp is not, use the bzlmod path
-        "@rules_swiftnav//cc:_enable_bzlmod_not_libcpp": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
-        "//conditions:default": "external/aarch64-sysroot",
+        "//conditions:default": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
     }),
     compiler = "clang",
     cxx_builtin_include_directories = select({
@@ -148,7 +146,7 @@ cc_toolchain_config(
         "strip": "wrappers/llvm-strip",
     },
     toolchain_identifier = "clang-aarch64-linux",
-    toolchain_path_prefix = "external/aarch64-linux-llvm20",
+    toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-linux-llvm20",
 )
 
 cc_toolchain(
diff --git a/cc/toolchains/llvm20/x86_64-aarch64-linux/BUILD.bazel b/cc/toolchains/llvm20/x86_64-aarch64-linux/BUILD.bazel
index 7a7f469b..1cc8f640 100644
--- a/cc/toolchains/llvm20/x86_64-aarch64-linux/BUILD.bazel
+++ b/cc/toolchains/llvm20/x86_64-aarch64-linux/BUILD.bazel
@@ -103,9 +103,7 @@ cc_toolchain_config(
     abi_version = "clang",
     builtin_sysroot = select({
         # _use_libcpp case needs to be implemented properly here!
-        # When bzlmod is enabled but libcpp is not, use the bzlmod path
-        "@rules_swiftnav//cc:_enable_bzlmod_not_libcpp": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
-        "//conditions:default": "external/aarch64-sysroot",
+        "//conditions:default": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
     }),
     compiler = "clang",
     cxx_builtin_include_directories = [
@@ -129,7 +127,7 @@ cc_toolchain_config(
         "strip": "wrappers/llvm-strip",
     },
     toolchain_identifier = "clang-x86_64-linux",
-    toolchain_path_prefix = "external/x86_64-linux-llvm20",
+    toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-llvm20",
 )
 
 cc_toolchain(
diff --git a/cc/toolchains/llvm20/x86_64-darwin/BUILD.bazel b/cc/toolchains/llvm20/x86_64-darwin/BUILD.bazel
index b64a5455..b32237ec 100644
--- a/cc/toolchains/llvm20/x86_64-darwin/BUILD.bazel
+++ b/cc/toolchains/llvm20/x86_64-darwin/BUILD.bazel
@@ -119,7 +119,7 @@ cc_toolchain_config(
         "strip": "wrappers/llvm-strip",
     },
     toolchain_identifier = "clang-x86_64-darwin",
-    toolchain_path_prefix = "external/x86_64-darwin-llvm20",
+    toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-darwin-llvm20",
 )
 
 cc_toolchain(
diff --git a/cc/toolchains/llvm20/x86_64-linux/BUILD.bazel b/cc/toolchains/llvm20/x86_64-linux/BUILD.bazel
index 8c090718..e9b9c433 100644
--- a/cc/toolchains/llvm20/x86_64-linux/BUILD.bazel
+++ b/cc/toolchains/llvm20/x86_64-linux/BUILD.bazel
@@ -117,9 +117,7 @@ cc_toolchain_config(
     abi_version = "clang",
     builtin_sysroot = select({
         "@rules_swiftnav//cc:_use_libcpp": None,
-        # When bzlmod is enabled but libcpp is not, use the bzlmod path
-        "@rules_swiftnav//cc:_enable_bzlmod_not_libcpp": "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-sysroot",
-        "//conditions:default": "external/x86_64-sysroot",
+        "//conditions:default": "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-sysroot",
     }),
     compiler = "clang",
     cxx_builtin_include_directories = select({
@@ -148,7 +146,7 @@ cc_toolchain_config(
         "strip": "wrappers/llvm-strip",
     },
     toolchain_identifier = "clang-x86_64-linux",
-    toolchain_path_prefix = "external/x86_64-linux-llvm20",
+    toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-llvm20",
 )
 
 cc_toolchain(
diff --git a/examples/small_world/.bazelrc b/examples/small_world/.bazelrc
index 16e2a407..bb5fabc7 100644
--- a/examples/small_world/.bazelrc
+++ b/examples/small_world/.bazelrc
@@ -1,5 +1,7 @@
 common --@rules_swiftnav//cc:enable_bzlmod=true
 
+build:aarch64_darwin_llvm20 --platforms @rules_swiftnav//platforms:aarch64_darwin_llvm20
+
 coverage --experimental_generate_llvm_lcov
 coverage --combined_report=lcov
 
diff --git a/examples/small_world/MODULE.bazel b/examples/small_world/MODULE.bazel
index b8adfc8b..17db2497 100644
--- a/examples/small_world/MODULE.bazel
+++ b/examples/small_world/MODULE.bazel
@@ -10,6 +10,7 @@ local_path_override(
 swift_cc_toolchain_ext = use_extension("@rules_swiftnav//cc:extensions.bzl", "swift_cc_toolchain_extension")
 use_repo(
     swift_cc_toolchain_ext,
+    "aarch64-darwin-llvm",
     "aarch64-darwin-llvm20",
     "aarch64-linux-llvm20",
     "aarch64-sysroot",
@@ -19,6 +20,7 @@ use_repo(
 )
 
 register_toolchains(
+    "@rules_swiftnav//cc/toolchains/llvm/aarch64-darwin:cc-toolchain-aarch64-darwin",
     "@rules_swiftnav//cc/toolchains/llvm20/aarch64-darwin:cc-toolchain-aarch64-darwin",
     "@rules_swiftnav//cc/toolchains/llvm20/x86_64-darwin:cc-toolchain-x86_64-darwin",
     "@rules_swiftnav//cc/toolchains/llvm20/aarch64-linux:cc-toolchain-aarch64-linux",
diff --git a/examples/small_world/MODULE.bazel.lock b/examples/small_world/MODULE.bazel.lock
index 814685ec..1a363499 100644
--- a/examples/small_world/MODULE.bazel.lock
+++ b/examples/small_world/MODULE.bazel.lock
@@ -779,7 +779,7 @@
     "@@rules_swiftnav+//cc:extensions.bzl%swift_cc_toolchain_extension": {
       "general": {
         "bzlTransitiveDigest": "zDwq2yBSEJXdECtks4+trENu8MzrMfkm5FDsxbO1KrE=",
-        "usagesDigest": "/sZf3PVlTNvymdcfHdN7OOfvku3qw7am6KKuBGcCrbk=",
+        "usagesDigest": "zhynMdOFUVVMdnsmvkEf+0ZpkwApqRyhSbD9DRT+6Vk=",
         "recordedFileInputs": {},
         "recordedDirentsInputs": {},
         "envVariables": {},