Skip to content

Commit f3e42bd

Browse files
ferrocene: build with compiler
configure Ferrocene compiler and build with it Signed-off-by: Dan Calavrezo <195309321+dcalavrezo-qorix@users.noreply.github.com>
1 parent cc7da92 commit f3e42bd

File tree

2 files changed

+5
-27
lines changed

2 files changed

+5
-27
lines changed

.bazelrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,15 @@ build:per_shared --host_platform=@score_bazel_platforms//:x86_64-linux
5252
build:per-x86_64-linux --config=per_shared
5353
build:per-x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux
5454
build:per-x86_64-linux --extra_toolchains=@gcc_toolchain//:host_gcc_12
55-
55+
build:per-x86_64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
5656
# -------------------------------------------------------------------------------
5757
# Config dedicated to target platform CPU:x86_64 and OS:QNX
5858
# -------------------------------------------------------------------------------
5959
build:per-x86_64-qnx --config=per_shared
6060
build:per-x86_64-qnx --platforms=@score_toolchains_qnx//platforms:x86_64-qnx
6161
build:per-x86_64-qnx --extra_toolchains=@toolchains_qnx_qcc//:qcc_x86_64
6262
build:per-x86_64-qnx --extra_toolchains=@toolchains_qnx_ifs//:ifs_x86_64
63+
build:per-x86_64-qnx --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_pc_nto_qnx800
6364

6465
# -------------------------------------------------------------------------------
6566
# Config dedicated to target platform CPU:arm64 and OS:QNX
@@ -68,6 +69,7 @@ build:per-arm64-qnx --config=per_shared
6869
build:per-arm64-qnx --platforms=@score_toolchains_qnx//platforms:aarch64-qnx8_0
6970
build:per-arm64-qnx --extra_toolchains=@toolchains_qnx_qcc//:qcc_aarch64
7071
build:per-arm64-qnx --extra_toolchains=@toolchains_qnx_ifs//:ifs_aarch64
72+
build:per-arm64-qnx --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_aarch64_unknown_nto_qnx800
7173

7274
# -------------------------------------------------------------------------------
7375
# Import local user workspace file, if exists

MODULE.bazel

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ bazel_dep(name = "rules_rust", version = "0.61.0")
4343
# Shared Rust policies (Clippy config, etc.), overridden locally during development.
4444
bazel_dep(name = "score_rust_policies", version = "0.0.2", dev_dependency = True)
4545

46-
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust", dev_dependency = True)
47-
rust.toolchain(
48-
edition = "2021",
49-
versions = ["1.85.0"],
50-
)
5146

5247
# bazel cc rules
5348
bazel_dep(name = "rules_cc", version = "0.1.2")
@@ -105,15 +100,6 @@ git_override(
105100
bazel_dep(name = "aspect_rules_lint", version = "1.10.2")
106101
bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
107102

108-
## additional settings / config
109-
bazel_dep(name = "rust_qnx8_toolchain", version = "1.0.0", dev_dependency = True)
110-
archive_override(
111-
module_name = "rust_qnx8_toolchain",
112-
strip_prefix = "qnx8",
113-
urls = [
114-
"https://github.com/qorix-group/rust-lang-qnx8/releases/download/1.0.0/qnx8_rust_toolchain.tar.gz",
115-
],
116-
)
117103

118104
## temporary overrides / tools
119105
# Testing utils dependency.
@@ -133,12 +119,8 @@ git_override(
133119
remote = "https://github.com/eclipse-score/baselibs.git",
134120
)
135121

136-
bazel_dep(name = "score_toolchains_rust", version = "0.1", dev_dependency = True)
137-
git_override(
138-
module_name = "score_toolchains_rust",
139-
commit = "5614e4b273f2f5302d47a05d7e58dae86f97a3c3",
140-
remote = "https://github.com/eclipse-score/toolchains_rust.git",
141-
)
122+
bazel_dep(name = "score_toolchains_rust", version = "0.2.0", dev_dependency = True)
123+
142124

143125
bazel_dep(name = "custom_qemu", version = "1.0.0", dev_dependency = True)
144126
archive_override(
@@ -150,11 +132,5 @@ archive_override(
150132
],
151133
)
152134

153-
# Registers the custom Rust toolchain wired to @qnx_rust
154-
register_toolchains(
155-
"@score_toolchains_rust//toolchains/aarch64-unknown-qnx8_0:toolchain_aarch64_qnx8_0",
156-
dev_dependency = True,
157-
)
158-
159135
# S-CORE crates
160136
bazel_dep(name = "score_crates", version = "0.0.6")

0 commit comments

Comments
 (0)