Rename bazel_features polyfill to prevent conflicts

bazelbuild · Jan 7, 2024 · fa04285 · fa04285
1 parent 8beaf2e
commit fa04285
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -5,7 +5,9 @@ module(
     repo_name = "io_bazel_rules_go",
 )
 
-bazel_dep(name = "bazel_features", version = "1.1.1")
+# The custom repo_name is used to prevent our bazel_features polyfill for WORKSPACE builds from
+# conflicting with the real bazel_features repo.
+bazel_dep(name = "bazel_features", version = "1.1.1", repo_name = "io_bazel_rules_go_bazel_features")
 bazel_dep(name = "bazel_skylib", version = "1.2.0")
 bazel_dep(name = "platforms", version = "0.0.4")
 bazel_dep(name = "rules_proto", version = "4.0.0")

diff --git a/go/private/BUILD.bazel b/go/private/BUILD.bazel
@@ -60,11 +60,11 @@ bzl_library(
         "//go/platform:apple",
         "//go/private:go_toolchain",
         "//go/private/rules:transition",
-        "@bazel_features//:features.bzl",
         "@bazel_skylib//lib:paths",
         "@bazel_skylib//rules:common_settings",
         "@bazel_tools//tools/build_defs/cc:action_names.bzl",
         "@bazel_tools//tools/cpp:toolchain_utils.bzl",
+        "@io_bazel_rules_go_bazel_features//:features.bzl",
         "@io_bazel_rules_nogo//:scope.bzl",
     ],
 )

diff --git a/go/private/context.bzl b/go/private/context.bzl
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@bazel_features//:features.bzl", "bazel_features")
+load("@io_bazel_rules_go_bazel_features//:features.bzl", "bazel_features")
 load(
     "@bazel_tools//tools/cpp:toolchain_utils.bzl",
     "find_cpp_toolchain",

diff --git a/go/private/extensions.bzl b/go/private/extensions.bzl
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@bazel_features//:features.bzl", "bazel_features")
+load("@io_bazel_rules_go_bazel_features//:features.bzl", "bazel_features")
 load("//go/private:sdk.bzl", "detect_host_platform", "go_download_sdk_rule", "go_host_sdk_rule", "go_multiple_toolchains")
 load("//go/private:nogo.bzl", "DEFAULT_NOGO", "go_register_nogo")
 

diff --git a/go/private/repositories.bzl b/go/private/repositories.bzl
@@ -287,7 +287,7 @@ def go_rules_dependencies(force = False):
 
     _maybe(
         polyfill_bazel_features,
-        name = "bazel_features",
+        name = "io_bazel_rules_go_bazel_features",
     )
 
 def _maybe(repo_rule, name, **kwargs):