diff --git a/.bazelrc b/.bazelrc index 05e4a21c..9e185e93 100644 --- a/.bazelrc +++ b/.bazelrc @@ -52,7 +52,7 @@ build:per_shared --host_platform=@score_bazel_platforms//:x86_64-linux build:per-x86_64-linux --config=per_shared build:per-x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux build:per-x86_64-linux --extra_toolchains=@gcc_toolchain//:host_gcc_12 - +build:per-x86_64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu # ------------------------------------------------------------------------------- # Config dedicated to target platform CPU:x86_64 and OS:QNX # ------------------------------------------------------------------------------- @@ -60,6 +60,7 @@ build:per-x86_64-qnx --config=per_shared build:per-x86_64-qnx --platforms=@score_toolchains_qnx//platforms:x86_64-qnx build:per-x86_64-qnx --extra_toolchains=@toolchains_qnx_qcc//:qcc_x86_64 build:per-x86_64-qnx --extra_toolchains=@toolchains_qnx_ifs//:ifs_x86_64 +build:per-x86_64-qnx --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_pc_nto_qnx800 # ------------------------------------------------------------------------------- # Config dedicated to target platform CPU:arm64 and OS:QNX @@ -68,6 +69,7 @@ build:per-arm64-qnx --config=per_shared build:per-arm64-qnx --platforms=@score_toolchains_qnx//platforms:aarch64-qnx8_0 build:per-arm64-qnx --extra_toolchains=@toolchains_qnx_qcc//:qcc_aarch64 build:per-arm64-qnx --extra_toolchains=@toolchains_qnx_ifs//:ifs_aarch64 +build:per-arm64-qnx --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_aarch64_unknown_nto_qnx800 # ------------------------------------------------------------------------------- # Import local user workspace file, if exists diff --git a/MODULE.bazel b/MODULE.bazel index 70720540..ce571510 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -43,12 +43,6 @@ bazel_dep(name = "rules_rust", version = "0.61.0") # Shared Rust policies (Clippy config, etc.), overridden locally during development. bazel_dep(name = "score_rust_policies", version = "0.0.2", dev_dependency = True) -rust = use_extension("@rules_rust//rust:extensions.bzl", "rust", dev_dependency = True) -rust.toolchain( - edition = "2021", - versions = ["1.85.0"], -) - # bazel cc rules bazel_dep(name = "rules_cc", version = "0.1.2") @@ -105,16 +99,6 @@ git_override( bazel_dep(name = "aspect_rules_lint", version = "1.10.2") bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2") -## additional settings / config -bazel_dep(name = "rust_qnx8_toolchain", version = "1.0.0", dev_dependency = True) -archive_override( - module_name = "rust_qnx8_toolchain", - strip_prefix = "qnx8", - urls = [ - "https://github.com/qorix-group/rust-lang-qnx8/releases/download/1.0.0/qnx8_rust_toolchain.tar.gz", - ], -) - ## temporary overrides / tools # Testing utils dependency. # Direct usage of tag in git_override reports false problem in editor, using hash of a tag @@ -133,13 +117,7 @@ git_override( remote = "https://github.com/eclipse-score/baselibs.git", ) -bazel_dep(name = "score_toolchains_rust", version = "0.1", dev_dependency = True) -git_override( - module_name = "score_toolchains_rust", - commit = "5614e4b273f2f5302d47a05d7e58dae86f97a3c3", - remote = "https://github.com/eclipse-score/toolchains_rust.git", -) - +bazel_dep(name = "score_toolchains_rust", version = "0.2.0", dev_dependency = True) bazel_dep(name = "custom_qemu", version = "1.0.0", dev_dependency = True) archive_override( module_name = "custom_qemu", @@ -150,11 +128,5 @@ archive_override( ], ) -# Registers the custom Rust toolchain wired to @qnx_rust -register_toolchains( - "@score_toolchains_rust//toolchains/aarch64-unknown-qnx8_0:toolchain_aarch64_qnx8_0", - dev_dependency = True, -) - # S-CORE crates bazel_dep(name = "score_crates", version = "0.0.6")