From 7c7e899bcd8218f08dc31aaa328d7073bb95d170 Mon Sep 17 00:00:00 2001 From: Davide Asnaghi <30296575+hexdae@users.noreply.github.com> Date: Tue, 23 Apr 2024 00:32:30 -0400 Subject: [PATCH] [AARCH64] update release (#50) * [AARCH64] update release * [BUILDIFIER] format --- .github/tools/release.sh | 14 +++++++++++++- MODULE.bazel.lock | 2 +- README.md | 8 ++++++++ examples/bzlmod/MODULE.bazel | 5 ----- examples/bzlmod/custom/BUILD | 2 +- examples/gcc_version/MODULE.bazel | 3 --- examples/raspberry_pi/platform/BUILD | 2 +- examples/raspberry_pi/toolchain/BUILD | 4 +++- examples/workspace/WORKSPACE | 6 +++++- 9 files changed, 32 insertions(+), 14 deletions(-) diff --git a/.github/tools/release.sh b/.github/tools/release.sh index d172317..dfe1f3d 100755 --- a/.github/tools/release.sh +++ b/.github/tools/release.sh @@ -18,6 +18,10 @@ SHA=$(shasum -a 256 $ARCHIVE | awk '{print $1}') cat << EOF ## MODULE.bazel +Feel free to pick only the toolchains you need. Default toolchains are provided +with `register_toolchains(@//toolchain:all)` but registering them +is optional (especially when using custom toolchains) + \`\`\`starlark bazel_dep(name = "toolchains_arm_gnu", version = "${TAG:1}") @@ -34,9 +38,12 @@ register_toolchains("@arm_none_linux_gnueabihf//toolchain:all") arm_toolchain.aarch64_none_elf() use_repo(arm_toolchain, "aarch64_none_elf") register_toolchains("@aarch64_none_elf//toolchain:all") + +arm_toolchain.aarch64_none_linux_gnu() +use_repo(arm_toolchain, "aarch64_none_linux_gnu") +register_toolchains("@aarch64_none_linux_gnu//toolchain:all") \`\`\` -Feel free to pick only the toolchains you need ## WORKSPACE @@ -73,6 +80,11 @@ register_toolchains("@arm_none_linux_gnueabihf//toolchain:all") load("@toolchains_arm_gnu//:deps.bzl", "aarch64_none_elf_deps") aarch64_none_elf_deps() register_toolchains("@aarch64_none_elf//toolchain:all") + +# Toolchain aarch64-none-linux-gnu +load("@toolchains_arm_gnu//:deps.bzl", "aarch64_none_linux_gnu_deps") +aarch64_none_linux_gnu_deps() +register_toolchains("@aarch64_none_linux_gnu//toolchain:all") \`\`\` diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 23e59d3..43e1d25 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -869,7 +869,7 @@ "moduleExtensions": { "//:extensions.bzl%arm_toolchain": { "general": { - "bzlTransitiveDigest": "3FLQvbbwHCY3+2SJfn8bf0iLlPvqSsI//FzKTzYdWOg=", + "bzlTransitiveDigest": "cMJJ7TWcbR1Ywfy9fx9zPw3P6lQJ5msZ2UjVsYibxq0=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { diff --git a/README.md b/README.md index ac745de..3b52cac 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,10 @@ register_toolchains("@arm_none_linux_gnueabihf//toolchain:all") arm_toolchain.aarch64_none_elf() use_repo(arm_toolchain, "aarch64_none_elf") register_toolchains("@aarch64_none_elf//toolchain:all") + +arm_toolchain.aarch64_none_linux_gnu() +use_repo(arm_toolchain, "aarch64_none_linux_gnu") +register_toolchains("@aarch64_none_linux_gnu//toolchain:all") ``` ## WORKSPACE @@ -113,6 +117,10 @@ register_toolchains("@arm_none_linux_gnueabihf//toolchain:all") load("@toolchains_arm_gnu//:deps.bzl", "aarch64_none_elf_deps") aarch64_none_elf_deps() register_toolchains("@aarch64_none_elf//toolchain:all") + +load("@toolchains_arm_gnu//:deps.bzl", "aarch64_none_linux_gnu_deps") +aarch64_none_linux_gnu_deps() +register_toolchains("@aarch64_none_linux_gnu//toolchain:all") ``` diff --git a/examples/bzlmod/MODULE.bazel b/examples/bzlmod/MODULE.bazel index 4e20457..0f2572c 100644 --- a/examples/bzlmod/MODULE.bazel +++ b/examples/bzlmod/MODULE.bazel @@ -8,20 +8,15 @@ module( bazel_dep(name = "aspect_bazel_lib", version = "2.0.0") bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "toolchains_arm_gnu") - local_path_override( module_name = "toolchains_arm_gnu", path = "../..", ) arm_toolchain = use_extension("@toolchains_arm_gnu//:extensions.bzl", "arm_toolchain") - arm_toolchain.arm_none_eabi(version = "13.2.1") - use_repo(arm_toolchain, "arm_none_eabi") - arm_toolchain.arm_none_linux_gnueabihf(version = "13.2.1") - use_repo(arm_toolchain, "arm_none_linux_gnueabihf") register_toolchains( diff --git a/examples/bzlmod/custom/BUILD b/examples/bzlmod/custom/BUILD index a646d40..27e9109 100644 --- a/examples/bzlmod/custom/BUILD +++ b/examples/bzlmod/custom/BUILD @@ -1,7 +1,7 @@ # project/BUILD.bazel -load("@rules_cc//cc:defs.bzl", "cc_binary") load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_filegroup") +load("@rules_cc//cc:defs.bzl", "cc_binary") cc_binary( name = "binary", diff --git a/examples/gcc_version/MODULE.bazel b/examples/gcc_version/MODULE.bazel index 5006236..d412712 100644 --- a/examples/gcc_version/MODULE.bazel +++ b/examples/gcc_version/MODULE.bazel @@ -8,16 +8,13 @@ module( bazel_dep(name = "aspect_bazel_lib", version = "2.0.0") bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "toolchains_arm_gnu") - local_path_override( module_name = "toolchains_arm_gnu", path = "../..", ) arm_toolchain = use_extension("@toolchains_arm_gnu//:extensions.bzl", "arm_toolchain") - arm_toolchain.arm_none_eabi(version = "9.2.1") - use_repo(arm_toolchain, "arm_none_eabi") register_toolchains("@arm_none_eabi//toolchain:all") diff --git a/examples/raspberry_pi/platform/BUILD b/examples/raspberry_pi/platform/BUILD index cb456df..f4089f6 100644 --- a/examples/raspberry_pi/platform/BUILD +++ b/examples/raspberry_pi/platform/BUILD @@ -23,4 +23,4 @@ platform( "//cpu:a76", ], visibility = ["//visibility:public"], -) \ No newline at end of file +) diff --git a/examples/raspberry_pi/toolchain/BUILD b/examples/raspberry_pi/toolchain/BUILD index 67facd3..7dcead7 100644 --- a/examples/raspberry_pi/toolchain/BUILD +++ b/examples/raspberry_pi/toolchain/BUILD @@ -7,7 +7,9 @@ aarch64_none_elf_toolchain( "-Wall", "-O2", "-ffreestanding", - "-nostdinc", "-nostdlib", "-nostartfiles" + "-nostdinc", + "-nostdlib", + "-nostartfiles", ], linkopts = [ "-mcpu=cortex-a53", diff --git a/examples/workspace/WORKSPACE b/examples/workspace/WORKSPACE index e7298df..7109432 100644 --- a/examples/workspace/WORKSPACE +++ b/examples/workspace/WORKSPACE @@ -24,7 +24,7 @@ local_repository( path = "../../", ) -load("@toolchains_arm_gnu//:deps.bzl", "aarch64_none_elf_deps", "arm_none_eabi_deps", "arm_none_linux_gnueabihf_deps") +load("@toolchains_arm_gnu//:deps.bzl", "aarch64_none_elf_deps", "aarch64_none_linux_gnu_deps", "arm_none_eabi_deps", "arm_none_linux_gnueabihf_deps") # Toolchain: arm-none-eabi arm_none_eabi_deps() @@ -40,5 +40,9 @@ aarch64_none_elf_deps() register_toolchains("@aarch64_none_elf//toolchain:all") +aarch64_none_linux_gnu_deps() + +register_toolchains("@aarch64_none_linux_gnu//toolchain:all") + # Custom toolchain register_toolchains("//custom/toolchain:all")