Migrate to bzl_mod paths

Author: martin4861

MODULE.bazel.lock

@@ -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 = [

cc/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,
 )
 

cc/toolchains/llvm/aarch64-darwin/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(

cc/toolchains/llvm/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(

cc/toolchains/llvm/x86_64-aarch64-linux/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(

cc/toolchains/llvm/x86_64-darwin/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(

cc/toolchains/llvm/x86_64-linux/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,
 )
 

cc/toolchains/llvm20/aarch64-darwin/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(

cc/toolchains/llvm20/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(