Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename bazel_features polyfill to prevent conflicts #3817

Merged
merged 1 commit into from
Jan 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion go/private/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Expand Down
2 changes: 1 addition & 1 deletion go/private/context.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion go/private/extensions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion go/private/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Loading