Skip to content

Commit 6bea559

Browse files
committed
use new toolchain
1 parent 185ae10 commit 6bea559

File tree

3 files changed

+29
-57
lines changed

3 files changed

+29
-57
lines changed

.bazelrc

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry
99
common --registry=https://bcr.bazel.build
1010
common --credential_helper=*.qnx.com=%workspace%/scripts/internal/qnx_creds.py
1111

12-
build:build_qnx8 --platforms=@score_bazel_platforms//:arm64-qnx8_0
13-
build:build_qnx8 --extra_toolchains=@toolchains_qnx_qcc//:qcc_aarch64
14-
build:build_qnx8 --extra_toolchains=@score_toolchains_rust//toolchains/aarch64-unknown-qnx8_0:toolchain_aarch64_qnx8_0
15-
build:build_qnx8 --extra_toolchains=@score_toolchains_rust//toolchains/x86_64-unknown-linux-gnu:toolchain_x86_64_linux
16-
build:build_qnx8 --extra_toolchains=@toolchains_qnx_ifs//:ifs_x86_64
17-
build:build_qnx8 --extra_toolchains=@toolchains_qnx_ifs//:ifs_aarch64
12+
build:arm64-qnx --platforms=@score_bazel_platforms//:aarch64-qnx-sdp_8.0.0-posix
13+
build:arm64-qnx --extra_toolchains=@score_qcc_aarch64_toolchain//:aarch64-qnx-sdp_8.0.0-posix
14+
build:arm64-qnx --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_aarch64_unknown_nto_qnx800
1815

19-
common --extra_toolchains=@gcc_toolchain//:host_gcc_12
20-
common --extra_toolchains=@score_toolchains_rust//toolchains/x86_64-unknown-linux-gnu:toolchain_x86_64_linux
16+
common --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0-posix
17+
common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu

.github/workflows/build_qnx8.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
pull-requests: read
2626
with:
2727
bazel-target: '//src/...'
28-
bazel-config: 'build_qnx8'
28+
bazel-config: 'arm64-qnx'
2929
credential-helper: 'scripts/internal/qnx_creds.py'
3030
environment-name: 'workflow-approval'
3131
secrets:

MODULE.bazel

Lines changed: 23 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# *******************************************************************************
1313
module(
1414
name = "score_baselibs_rust",
15-
version = "0.0.1",
15+
version = "0.0.0",
1616
compatibility_level = 0,
1717
)
1818

@@ -26,66 +26,45 @@ bazel_dep(name = "buildifier_prebuilt", version = "7.3.1")
2626
bazel_dep(name = "platforms", version = "1.0.0")
2727

2828
# S-CORE process rules
29-
bazel_dep(name = "score_bazel_platforms", version = "0.0.3")
29+
bazel_dep(name = "score_bazel_platforms", version = "0.0.4")
3030
bazel_dep(name = "score_docs_as_code", version = "2.0.2")
31-
bazel_dep(name = "score_tooling", version = "1.0.4")
31+
bazel_dep(name = "score_tooling", version = "1.1.0")
3232
bazel_dep(name = "score_rust_policies", version = "0.0.3")
3333

3434
bazel_dep(name = "score_process", version = "1.4.0", dev_dependency = True)
3535
bazel_dep(name = "score_platform", version = "0.5.1", dev_dependency = True) # This is main score repo
3636
# bazel_dep(name = "score_virtualization", version = "0.0.1", dev_dependency = True)
3737

3838
# Toolchains and extensions
39-
bazel_dep(name = "score_toolchains_gcc", version = "0.5", dev_dependency = True)
40-
bazel_dep(name = "score_toolchains_qnx", version = "0.0.6", dev_dependency = True)
41-
bazel_dep(name = "rust_qnx8_toolchain", version = "1.2.0", dev_dependency = True)
42-
bazel_dep(name = "score_toolchains_rust", version = "0.1.1", dev_dependency = True)
39+
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.1", dev_dependency = True)
40+
bazel_dep(name = "score_toolchains_rust", version = "0.4.0", dev_dependency = True)
4341

4442
# S-CORE crates
4543
bazel_dep(name = "score_crates", version = "0.0.6")
4644

47-
# Overrides
48-
git_override(
49-
module_name = "score_tooling",
50-
commit = "612d6f180a9bb6338de5f0e6667fcf83068d9c37", #until 1.0.5 is released
51-
remote = "https://github.com/eclipse-score/tooling.git",
52-
)
53-
54-
git_override(
55-
module_name = "score_toolchains_rust",
56-
commit = "bcf8e5364f72cf136ec81960350a82e2b5c45449",
57-
remote = "https://github.com/eclipse-score/toolchains_rust.git",
58-
)
59-
60-
# git_override(
61-
# module_name = "score_virtualization",
62-
# commit = "99d3f153c43796b67a63e82aad1ede6a881aa6af",
63-
# remote = "https://github.com/qorix-group/score_virtualization.git",
64-
# )
65-
66-
archive_override(
67-
module_name = "rust_qnx8_toolchain",
68-
strip_prefix = "qnx8",
69-
urls = [
70-
"https://github.com/qorix-group/rust-lang-qnx8/releases/download/1.2.0/qnx8_rust_toolchain.tar.gz",
71-
],
72-
)
73-
7445
# Extensions
46+
gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)
47+
gcc.toolchain(
48+
name = "score_qcc_aarch64_toolchain",
49+
target_cpu = "aarch64",
50+
target_os = "qnx",
51+
sdp_version = "8.0.0",
52+
version = "12.2.0",
53+
use_default_package = True,
54+
)
7555

76-
gcc = use_extension("@score_toolchains_gcc//extentions:gcc.bzl", "gcc", dev_dependency = True)
7756
gcc.toolchain(
78-
sha256 = "457f5f20f57528033cb840d708b507050d711ae93e009388847e113b11bf3600",
79-
strip_prefix = "x86_64-unknown-linux-gnu",
80-
url = "https://github.com/eclipse-score/toolchains_gcc_packages/releases/download/0.0.1/x86_64-unknown-linux-gnu_gcc12.tar.gz",
57+
name = "score_gcc_x86_64_toolchain",
58+
target_cpu = "x86_64",
59+
target_os = "linux",
60+
version = "12.2.0",
61+
use_default_package = True,
8162
)
82-
use_repo(gcc, "gcc_toolchain", "gcc_toolchain_gcc")
8363

84-
toolchains_qnx = use_extension("@score_toolchains_qnx//:extensions.bzl", "toolchains_qnx", dev_dependency = True)
85-
toolchains_qnx.sdp(
86-
sha256 = "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63",
87-
strip_prefix = "installation",
88-
url = "https://www.qnx.com/download/download/79858/installation.tgz",
64+
use_repo(
65+
gcc,
66+
"score_gcc_x86_64_toolchain",
67+
"score_qcc_aarch64_toolchain",
8968
)
9069

9170
PYTHON_VERSION = "3.12"
@@ -96,7 +75,3 @@ python.toolchain(
9675
python_version = PYTHON_VERSION,
9776
)
9877
use_repo(python)
99-
100-
use_repo(toolchains_qnx, "toolchains_qnx_sdp")
101-
use_repo(toolchains_qnx, "toolchains_qnx_qcc")
102-
use_repo(toolchains_qnx, "toolchains_qnx_ifs")

0 commit comments

Comments
 (0)