Skip to content

Commit 92de8c7

Browse files
authored
[RENAME] arm_gnu_toolchain -> toolchains_arm_gnu (#40)
1 parent 429fb81 commit 92de8c7

File tree

15 files changed

+59
-59
lines changed

15 files changed

+59
-59
lines changed

.github/workflows/release_prep.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ cat << EOF
2222
2. Add to your \`MODULE.bazel\` file:
2323
2424
\`\`\`starlark
25-
bazel_dep(name = "arm_gnu_toolchain", version = "${TAG:1}")
25+
bazel_dep(name = "toolchains_arm_gnu", version = "${TAG:1}")
2626
2727
# Toolchains: arm-none-eabi
28-
arm_toolchain = use_extension("@arm_gnu_toolchain//:extensions.bzl", "arm_toolchain")
28+
arm_toolchain = use_extension("@toolchains_arm_gnu//:extensions.bzl", "arm_toolchain")
2929
arm_toolchain.arm_none_eabi(version = "13.2.1")
3030
use_repo(
3131
arm_toolchain,

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
"""ARM cross compilation toolchains for bazel"""
22

33
module(
4-
name = "arm_gnu_toolchain",
4+
name = "toolchains_arm_gnu",
55
version = "0.0.1",
66
compatibility_level = 1,
77
)
88

99
bazel_dep(name = "platforms", version = "0.0.8")
1010
bazel_dep(name = "rules_cc", version = "0.0.9")
1111

12-
arm_toolchain = use_extension("@arm_gnu_toolchain//:extensions.bzl", "arm_toolchain")
12+
arm_toolchain = use_extension("@toolchains_arm_gnu//:extensions.bzl", "arm_toolchain")
1313

1414
# NOTE: It's important that we update these versions whenever a new toolchain
1515
# version is added--otherwise the Minimum Selected Version algorithm in the

MODULE.bazel.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ Please look at the [`examples`](./examples/) folder for reference usage
6767
```python
6868
# MODULE.bazel
6969

70-
bazel_dep(name = "arm_gnu_toolchain", version = "0.0.1")
70+
bazel_dep(name = "toolchains_arm_gnu", version = "0.0.1")
7171

7272
git_override(
73-
module_name = "arm_gnu_toolchain",
73+
module_name = "toolchains_arm_gnu",
7474
remote = "https://github.com/hexdae/bazel-arm-none-eabi",
7575
branch = "master",
7676
)
7777

7878
# Toolchains: arm-none-eabi
79-
arm_toolchain = use_extension("@arm_gnu_toolchain//:extensions.bzl", "arm_toolchain")
79+
arm_toolchain = use_extension("@toolchains_arm_gnu//:extensions.bzl", "arm_toolchain")
8080
arm_toolchain.arm_none_eabi(version = "9.2.1")
8181
use_repo(
8282
arm_toolchain,
@@ -125,12 +125,12 @@ git_repository(
125125
)
126126

127127
# Toolchain: arm-none-eabi
128-
load("@arm_gnu_toolchain//:deps.bzl", "arm_none_eabi_deps", "register_default_arm_none_eabi_toolchains")
128+
load("@toolchains_arm_gnu//:deps.bzl", "arm_none_eabi_deps", "register_default_arm_none_eabi_toolchains")
129129
arm_none_eabi_deps()
130130
register_default_arm_none_eabi_toolchains()
131131

132132
# Toolchain arm-none-linux-gnueabihf
133-
load("@arm_gnu_toolchain//:deps.bzl", "arm_none_linux_gnueabihf_deps", "register_default_arm_none_linux_gnueabihf_toolchains")
133+
load("@toolchains_arm_gnu//:deps.bzl", "arm_none_linux_gnueabihf_deps", "register_default_arm_none_linux_gnueabihf_toolchains")
134134
arm_none_linux_gnueabihf_deps()
135135
register_default_arm_none_linux_gnueabihf_toolchains()
136136
```
@@ -146,7 +146,7 @@ In a BUILD file:
146146
```python
147147
# path/to/toolchains/BUILD
148148

149-
load("@arm_gnu_toolchain//toolchain:toolchain.bzl", "arm_none_eabi_toolchain")
149+
load("@toolchains_arm_gnu//toolchain:toolchain.bzl", "arm_none_eabi_toolchain")
150150
arm_none_eabi_toolchain(
151151
name = "custom_toolchain",
152152
target_compatible_with = [

deps.bzl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""deps.bzl"""
22

33
load(
4-
"@arm_gnu_toolchain//toolchain:toolchain.bzl",
4+
"@toolchains_arm_gnu//toolchain:toolchain.bzl",
55
"register_arm_gnu_toolchain",
66
"target_constraints",
77
)
@@ -81,21 +81,21 @@ GCC_ARM_NONE_LINUX_GNUEABIHF = {
8181
"sha256": "df0f4927a67d1fd366ff81e40bd8c385a9324fbdde60437a512d106215f257b3",
8282
"strip_prefix": "arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-linux-gnueabihf",
8383
"url": "https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz?rev=adb0c0238c934aeeaa12c09609c5e6fc&hash=68DA67DE12CBAD82A0FA4B75247E866155C93053",
84-
"patches": ["@arm_gnu_toolchain//toolchain:patches/0001-Resolve-libc-relative-to-sysroot.patch"],
84+
"patches": ["@toolchains_arm_gnu//toolchain:patches/0001-Resolve-libc-relative-to-sysroot.patch"],
8585
},
8686
{
8787
"name": "arm_none_linux_gnueabihf_linux_aarch64",
8888
"sha256": "8ad384bb328bccc44396d85c8f8113b7b8c5e11bcfef322e77cda3ebe7baadb5",
8989
"strip_prefix": "arm-gnu-toolchain-13.2.Rel1-aarch64-arm-none-linux-gnueabihf",
9090
"url": "https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz?rev=fbdb67e76c8349e5ad27a7c40fb270c9&hash=8CD3EBFFDC5E211275B705F6F9BCC0F6F5B4A53E",
91-
"patches": ["@arm_gnu_toolchain//toolchain:patches/0001-Resolve-libc-relative-to-sysroot.patch"],
91+
"patches": ["@toolchains_arm_gnu//toolchain:patches/0001-Resolve-libc-relative-to-sysroot.patch"],
9292
},
9393
{
9494
"name": "arm_none_linux_gnueabihf_windows_x86_64",
9595
"sha256": "047e72bcef8f7767691f36929a8c74ef66f717cf6264a31f48dd31bfb067f4c8",
9696
"strip_prefix": "arm-gnu-toolchain-13.2.Rel1-mingw-w64-i686-arm-none-linux-gnueabihf",
9797
"url": "https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-linux-gnueabihf.zip?rev=14b6dd20622a4beabb60a6ee41a4c141&hash=C1F9FA6DE8259B5ACA0211139F4304F2B942E489",
98-
"patches": ["@arm_gnu_toolchain//toolchain:patches/0001-Resolve-libc-relative-to-sysroot.patch"],
98+
"patches": ["@toolchains_arm_gnu//toolchain:patches/0001-Resolve-libc-relative-to-sysroot.patch"],
9999
"bin_extension": ".exe",
100100
},
101101
],
@@ -110,7 +110,7 @@ def _arm_gnu_cross_hosted_platform_specific_repo_impl(repository_ctx):
110110
)
111111
repository_ctx.template(
112112
"BUILD.bazel",
113-
Label("@arm_gnu_toolchain//toolchain:templates/compiler.BUILD"),
113+
Label("@toolchains_arm_gnu//toolchain:templates/compiler.BUILD"),
114114
substitutions = {
115115
"%toolchain_prefix%": repository_ctx.attr.toolchain_prefix,
116116
"%version%": repository_ctx.attr.version,
@@ -137,7 +137,7 @@ def _arm_gnu_toolchain_repo_impl(repository_ctx):
137137
"""Defines the top-level toolchain repository."""
138138
repository_ctx.template(
139139
"BUILD",
140-
Label("@arm_gnu_toolchain//toolchain:templates/top.BUILD"),
140+
Label("@toolchains_arm_gnu//toolchain:templates/top.BUILD"),
141141
substitutions = {
142142
"%toolchain_name%": repository_ctx.attr.toolchain_name,
143143
"%version%": repository_ctx.attr.version,
@@ -147,15 +147,15 @@ def _arm_gnu_toolchain_repo_impl(repository_ctx):
147147

148148
repository_ctx.template(
149149
"toolchain/BUILD",
150-
Label("@arm_gnu_toolchain//toolchain:templates/toolchain.BUILD"),
150+
Label("@toolchains_arm_gnu//toolchain:templates/toolchain.BUILD"),
151151
substitutions = {
152152
"%toolchain_name%": repository_ctx.attr.toolchain_name,
153153
"%version%": repository_ctx.attr.version,
154154
"%toolchain_prefix%": repository_ctx.attr.toolchain_prefix,
155155
},
156156
)
157157

158-
arm_gnu_toolchain_repo = repository_rule(
158+
toolchains_arm_gnu_repo = repository_rule(
159159
implementation = _arm_gnu_toolchain_repo_impl,
160160
attrs = {
161161
"toolchain_name": attr.string(mandatory = True),
@@ -164,8 +164,8 @@ arm_gnu_toolchain_repo = repository_rule(
164164
},
165165
)
166166

167-
def arm_gnu_toolchain_deps(toolchain, toolchain_prefix, version, archives):
168-
arm_gnu_toolchain_repo(
167+
def toolchains_arm_gnu_deps(toolchain, toolchain_prefix, version, archives):
168+
toolchains_arm_gnu_repo(
169169
name = toolchain,
170170
toolchain_name = toolchain,
171171
toolchain_prefix = toolchain_prefix,
@@ -195,7 +195,7 @@ def arm_none_eabi_deps(version = "13.2.1", archives = GCC_ARM_NONE_EABI):
195195
version: The version of the toolchain to use. If None, the latest version is used.
196196
archives: A dictionary of version to archive attributes.
197197
"""
198-
arm_gnu_toolchain_deps(
198+
toolchains_arm_gnu_deps(
199199
"arm_none_eabi",
200200
"arm-none-eabi",
201201
version,
@@ -217,7 +217,7 @@ def arm_none_linux_gnueabihf_deps(version = "13.2.1", archives = GCC_ARM_NONE_LI
217217
version: The version of the toolchain to use. If None, the latest version is used.
218218
archives: A dictionary of the version to archive attributes.
219219
"""
220-
arm_gnu_toolchain_deps(
220+
toolchains_arm_gnu_deps(
221221
"arm_none_linux_gnueabihf",
222222
"arm-none-linux-gnueabihf",
223223
version,

examples/bzlmod/MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ module(
77

88
bazel_dep(name = "aspect_bazel_lib", version = "2.0.0")
99
bazel_dep(name = "bazel_skylib", version = "1.5.0")
10-
bazel_dep(name = "arm_gnu_toolchain")
10+
bazel_dep(name = "toolchains_arm_gnu")
1111
local_path_override(
12-
module_name = "arm_gnu_toolchain",
12+
module_name = "toolchains_arm_gnu",
1313
path = "../..",
1414
)
1515

16-
arm_toolchain = use_extension("@arm_gnu_toolchain//:extensions.bzl", "arm_toolchain")
16+
arm_toolchain = use_extension("@toolchains_arm_gnu//:extensions.bzl", "arm_toolchain")
1717
arm_toolchain.arm_none_eabi(version = "13.2.1")
1818
use_repo(
1919
arm_toolchain,

examples/bzlmod/MODULE.bazel.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/bzlmod/custom/toolchain/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@arm_gnu_toolchain//toolchain:toolchain.bzl", "arm_none_eabi_toolchain")
1+
load("@toolchains_arm_gnu//toolchain:toolchain.bzl", "arm_none_eabi_toolchain")
22

33
# Cortex-M3 toolchain
44
arm_none_eabi_toolchain(

examples/workspace/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ git_repository(
2020
)
2121

2222
local_repository(
23-
name = "arm_gnu_toolchain",
23+
name = "toolchains_arm_gnu",
2424
path = "../../",
2525
)
2626

27-
load("@arm_gnu_toolchain//:deps.bzl", "arm_none_eabi_deps", "arm_none_linux_gnueabihf_deps", "register_default_arm_none_eabi_toolchains", "register_default_arm_none_linux_gnueabihf_toolchains")
27+
load("@toolchains_arm_gnu//:deps.bzl", "arm_none_eabi_deps", "arm_none_linux_gnueabihf_deps", "register_default_arm_none_eabi_toolchains", "register_default_arm_none_linux_gnueabihf_toolchains")
2828

2929
# Toolchain: arm-none-eabi
3030
arm_none_eabi_deps()

examples/workspace/custom/toolchain/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@arm_gnu_toolchain//toolchain:toolchain.bzl", "arm_none_eabi_toolchain")
1+
load("@toolchains_arm_gnu//toolchain:toolchain.bzl", "arm_none_eabi_toolchain")
22

33
# Cortex-M3 toolchain
44
arm_none_eabi_toolchain(

0 commit comments

Comments
 (0)