Skip to content

Commit 4dc7620

Browse files
committed
Rename bazel_features polyfill to prevent conflicts
1 parent 77c58e0 commit 4dc7620

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

MODULE.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ module(
55
repo_name = "io_bazel_rules_go",
66
)
77

8-
bazel_dep(name = "bazel_features", version = "1.1.1")
8+
# The custom repo_name is used to prevent our bazel_features polyfill for WORKSPACE builds from
9+
# conflicting with the real bazel_features repo.
10+
bazel_dep(name = "bazel_features", version = "1.1.1", repo_name = "io_bazel_rules_go_bazel_features")
911
bazel_dep(name = "bazel_skylib", version = "1.2.0")
1012
bazel_dep(name = "platforms", version = "0.0.4")
1113
bazel_dep(name = "rules_proto", version = "4.0.0")

go/private/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ bzl_library(
6060
"//go/platform:apple",
6161
"//go/private:go_toolchain",
6262
"//go/private/rules:transition",
63-
"@bazel_features//:features.bzl",
6463
"@bazel_skylib//lib:paths",
6564
"@bazel_skylib//rules:common_settings",
6665
"@bazel_tools//tools/build_defs/cc:action_names.bzl",
6766
"@bazel_tools//tools/cpp:toolchain_utils.bzl",
67+
"@io_bazel_rules_go_bazel_features//:features.bzl",
6868
"@io_bazel_rules_nogo//:scope.bzl",
6969
],
7070
)

go/private/context.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
load("@bazel_features//:features.bzl", "bazel_features")
15+
load("@io_bazel_rules_go_bazel_features//:features.bzl", "bazel_features")
1616
load(
1717
"@bazel_tools//tools/cpp:toolchain_utils.bzl",
1818
"find_cpp_toolchain",

go/private/extensions.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
load("@bazel_features//:features.bzl", "bazel_features")
15+
load("@io_bazel_rules_go_bazel_features//:features.bzl", "bazel_features")
1616
load("//go/private:sdk.bzl", "detect_host_platform", "go_download_sdk_rule", "go_host_sdk_rule", "go_multiple_toolchains")
1717
load("//go/private:nogo.bzl", "DEFAULT_NOGO", "go_register_nogo")
1818

go/private/repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ def go_rules_dependencies(force = False):
287287

288288
_maybe(
289289
polyfill_bazel_features,
290-
name = "bazel_features",
290+
name = "io_bazel_rules_go_bazel_features",
291291
)
292292

293293
def _maybe(repo_rule, name, **kwargs):

0 commit comments

Comments
 (0)