Skip to content

Commit b3ac343

Browse files
committed
Revert link_hack change
This works in the same repo, but not when pulled in as another dep. Need to find a new solution for bazel @ HEAD, but this restores support for our previously supported versions.
1 parent 06a6841 commit b3ac343

File tree

4 files changed

+15
-1
lines changed

4 files changed

+15
-1
lines changed

MODULE.bazel

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,9 @@ versions(
5656
dev_dependency = True,
5757
python_versions = _PYTHON_VERSIONS,
5858
)
59+
60+
link_hack = use_repo_rule("//mojo/private:link_hack.bzl", "link_hack")
61+
62+
link_hack(
63+
name = "build_bazel_rules_android", # See link_hack.bzl for details
64+
)
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@
33
https://github.com/bazelbuild/bazel/pull/23838
44
"""
55

6+
def _link_hack_impl(rctx):
7+
rctx.file("BUILD.bazel", "")
8+
rctx.file("link_hack.bzl", """\
69
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
710
811
def link_hack(**kwargs):
912
return cc_common.link(**kwargs)
13+
""")
14+
15+
link_hack = repository_rule(
16+
implementation = _link_hack_impl,
17+
)

mojo/private/mojo_binary_test.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
load("@bazel_skylib//lib:paths.bzl", "paths")
44
load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
55
load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
6+
load("@build_bazel_rules_android//:link_hack.bzl", "link_hack") # See link_hack.bzl for details
67
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
78
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
89
load("@rules_python//python:py_info.bzl", "PyInfo")
910
load("//mojo:providers.bzl", "MojoInfo")
10-
load("//tools/build_defs/android:link_hack.bzl", "link_hack") # See link_hack.bzl for details
1111
load(":transitions.bzl", "python_version_transition")
1212
load(":utils.bzl", "MOJO_EXTENSIONS", "collect_mojoinfo")
1313

tools/build_defs/android/BUILD.bazel

Whitespace-only changes.

0 commit comments

Comments
 (0)