[ARCHIVES] move under toolchain

hexdae · Apr 4, 2024 · 8c5ce62 · 8c5ce62
1 parent 85ea89c
commit 8c5ce62
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 29 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -15,7 +15,7 @@ arm_toolchain = use_extension("@toolchains_arm_gnu//:extensions.bzl", "arm_toolc
 # version is added--otherwise the Minimum Selected Version algorithm in the
 # module extension will select the version here if a consumer attempts to use
 # the newer toolchain.
-arm_toolchain.arm_none_eabi(version = "13.2.1")
+arm_toolchain.arm_none_eabi(version = "13.2.1-1.1")
 use_repo(
     arm_toolchain,
     "arm_none_eabi",

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/deps.bzl b/deps.bzl
@@ -1,7 +1,7 @@
 """deps.bzl"""
 
-load("@toolchains_arm_gnu//archive:arm_none_eabi.bzl", "ARM_NONE_EABI")
-load("@toolchains_arm_gnu//archive:arm_none_linux_gnueabihf.bzl", "ARM_NONE_LINUX_GNUEABIHF")
+load("@toolchains_arm_gnu//toolchain/archives:arm_none_eabi.bzl", "ARM_NONE_EABI")
+load("@toolchains_arm_gnu//toolchain/archives:arm_none_linux_gnueabihf.bzl", "ARM_NONE_LINUX_GNUEABIHF")
 load("@toolchains_arm_gnu//toolchain:toolchain.bzl", "register_arm_gnu_toolchain", "target_constraints")
 
 def _arm_gnu_cross_hosted_platform_specific_repo_impl(repository_ctx):
@@ -16,7 +16,7 @@ def _arm_gnu_cross_hosted_platform_specific_repo_impl(repository_ctx):
         Label("@toolchains_arm_gnu//toolchain:templates/compiler.BUILD"),
         substitutions = {
             "%toolchain_prefix%": repository_ctx.attr.toolchain_prefix,
-            "%version%": repository_ctx.attr.version,
+            "%version%": repository_ctx.attr.version.split("-")[0],
             "%bin_extension%": repository_ctx.attr.bin_extension,
         },
     )

diff --git a/archive/BUILD → toolchain/archives/BUILD b/archive/BUILD → toolchain/archives/BUILD
diff --git a/archive/README.md → toolchain/archives/README.md b/archive/README.md → toolchain/archives/README.md
@@ -7,5 +7,5 @@ Publicly hosted archives
 The toolchains can be autogenerated from github for convenience
 
 ```bash
-bazel run //archive:generate --toolchain <prefix>
+bazel run //toolchain/archives:generate --toolchain <prefix>
 ```
diff --git a/archive/arm_none_eabi.bzl → toolchain/archives/arm_none_eabi.bzl b/archive/arm_none_eabi.bzl → toolchain/archives/arm_none_eabi.bzl
diff --git a/archive/arm_none_linux_gnueabihf.bzl → ...ain/archives/arm_none_linux_gnueabihf.bzl b/archive/arm_none_linux_gnueabihf.bzl → ...ain/archives/arm_none_linux_gnueabihf.bzl
diff --git a/archive/generate.py → toolchain/archives/generate.py b/archive/generate.py → toolchain/archives/generate.py