Skip to content

Commit ed7da09

Browse files
committed
update to latest score_bazel_cpp_toolchains
1 parent 8f0e19c commit ed7da09

5 files changed

Lines changed: 35 additions & 51 deletions

File tree

.bazelrc

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,15 @@ build --experimental_retain_test_configuration_across_testonly #https://github.c
2929
test --test_tag_filters=-manual
3030
test --test_output=errors
3131

32-
build:_bl_common --host_platform=@score_bazel_platforms//:x86_64-linux
32+
build:shared --sandbox_writable_path=/var/tmp
33+
build:shared --host_platform=@score_bazel_platforms//:x86_64-linux
3334

34-
# This config is for internal module usage ONLY.
35-
build:bl-x86_64-linux --config=_bl_common
36-
build:bl-x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux
37-
build:bl-x86_64-linux --extra_toolchains=@gcc_toolchain//:host_gcc_12
35+
build:x86_64-linux --config=shared
36+
build:x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix
37+
build:x86_64-linux --features=-treat_warnings_as_errors # due to baselibs deprecations
38+
39+
# this is deprecated, use build:x86_64-linux instead
40+
build:_bl_common --host_platform=@score_bazel_platforms//:x86_64-linux
3841

3942
# This config is for internal module usage ONLY.
4043
build:bl-x86_64-qnx --config=_bl_common

.github/workflows/reusable_smoke-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
fail-fast: false
139139
matrix:
140140
config:
141-
- bl-x86_64-linux
141+
- x86_64-linux
142142
# Add more configs here as needed
143143
# - bl-aarch64-linux
144144
# - bl-x86_64-qnx

README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,22 @@ bazel run //:docs_combo_experimental
1818
```
1919
## Working Builds ✅
2020

21-
The following modules build successfully with the `bl-x86_64-linux` configuration:
21+
The following modules build successfully with the `x86_64-linux` configuration:
2222

2323
### Baselibs
2424
```bash
25-
bazel build --config bl-x86_64-linux @score_baselibs//score/... --verbose_failures
25+
bazel build --config x86_64-linux @score_baselibs//score/... --verbose_failures
26+
bazel build --config x86_64-linux @score_baselibs//score/... --verbose_failures
2627
```
2728

2829
### Communication
2930
```bash
30-
bazel build --config bl-x86_64-linux @score_communication//score/mw/com:com --verbose_failures
31+
bazel build --config x86_64-linux @score_communication//score/mw/com:com --verbose_failures
3132
```
3233

3334
### Persistency
3435
```bash
35-
bazel build --config bl-x86_64-linux \
36+
bazel build --config x86_64-linux \
3637
@score_persistency//src/cpp/src/... \
3738
@score_persistency//src/rust/... \
3839
--verbose_failures
@@ -43,18 +44,18 @@ bazel build --config bl-x86_64-linux \
4344
### Orchestration and `kyron` - async runtime for Rust
4445

4546
```bash
46-
bazel build --config bl-x86_64-linux @score_orchestrator//src/...
47+
bazel build --config x86_64-linux @score_orchestrator//src/...
4748
```
4849

4950
## Feature showcase examples
5051
The examples that are aiming to showcase features provided by S-CORE are located in `feature_showcase` folder.
51-
You can run them currently for host platform using `--config bl-x86_64-linux`.
52+
You can run them currently for host platform using `--config x86_64-linux`.
5253

5354
Execute `bazel query //feature_showcase/...` to obtain list of targets that You can run.
5455

5556

5657
```bash
57-
bazel build --config bl-x86_64-linux @score_orchestrator//src/... --verbose_failures
58+
bazel build --config x86_64-linux @score_orchestrator//src/... --verbose_failures
5859
```
5960

6061
## Operating system integrations
@@ -146,7 +147,7 @@ bazel build @feo//... --verbose_failures
146147

147148
### Persistency (Full Build)
148149
```bash
149-
bazel build --config bl-x86_64-linux @score_persistency//src/... --verbose_failures
150+
bazel build --config x86_64-linux @score_persistency//src/... --verbose_failures
150151
```
151152

152153
## System Dependencies

score_toolchains.MODULE.bazel

Lines changed: 15 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,22 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313

14-
# QNX toolchain
15-
bazel_dep(name = "score_toolchains_qnx", version = "0.0.6")
16-
toolchains_qnx = use_extension("@score_toolchains_qnx//:extensions.bzl", "toolchains_qnx")
17-
toolchains_qnx.sdp(
18-
sha256 = "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63",
19-
strip_prefix = "installation",
20-
url = "https://www.qnx.com/download/download/79858/installation.tgz",
21-
)
22-
use_repo(toolchains_qnx, "toolchains_qnx_sdp")
23-
use_repo(toolchains_qnx, "toolchains_qnx_qcc")
24-
use_repo(toolchains_qnx, "toolchains_qnx_ifs")
25-
register_toolchains(
26-
"@toolchains_qnx_ifs//:ifs_x86_64",
27-
"@toolchains_qnx_ifs//:ifs_aarch64",
28-
dev_dependency = True,
29-
)
3014

31-
#gcc toolchain for baselibs
32-
bazel_dep(name = "score_toolchains_gcc", version = "0.5", dev_dependency = False)
33-
gcc = use_extension("@score_toolchains_gcc//extentions:gcc.bzl", "gcc", dev_dependency = False)
34-
# Align toolchain archive with persistency module (v0.0.3) so its labels (e.g. host_gcc_12) are present.
15+
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.0")
16+
gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)
17+
18+
# *******************************************************************************
19+
# Setting default GCC (CPU:x86_64|OS:Linux|V:12.2.0|ES:posix)
20+
# *******************************************************************************
3521
gcc.toolchain(
36-
url = "https://github.com/eclipse-score/toolchains_gcc_packages/releases/download/v0.0.3/x86_64-unknown-linux-gnu_gcc12.tar.gz",
37-
sha256 = "8fa85c2a93a6bef1cf866fa658495a2416dfeec692e4246063b791abf18da083",
38-
strip_prefix = "x86_64-unknown-linux-gnu",
39-
)
40-
gcc.extra_features(
41-
features = [
42-
"minimal_warnings",
43-
"treat_warnings_as_errors",
44-
],
22+
name = "score_gcc_toolchain",
23+
target_cpu = "x86_64",
24+
target_os = "linux",
25+
version = "12.2.0",
26+
use_default_package = True,
4527
)
46-
gcc.warning_flags(
47-
minimal_warnings = ["-Wall", "-Wno-error=deprecated-declarations", "-Wno-error=narrowing"],
48-
strict_warnings = ["-Wextra", "-Wpedantic"],
49-
treat_warnings_as_errors = ["-Werror"],
28+
29+
use_repo(
30+
gcc,
31+
"score_gcc_toolchain",
5032
)
51-
use_repo(gcc, "gcc_toolchain", "gcc_toolchain_gcc")
52-
register_toolchains("@gcc_toolchain//:all")

scripts/integration_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ def main():
265265
)
266266
parser.add_argument(
267267
'--config',
268-
default=os.environ.get('CONFIG', 'bl-x86_64-linux'),
269-
help='Bazel config to use (default: bl-x86_64-linux, or from CONFIG env var)'
268+
default=os.environ.get('CONFIG', 'x86_64-linux'),
269+
help='Bazel config to use (default: x86_64-linux, or from CONFIG env var)'
270270
)
271271

272272
args = parser.parse_args()

0 commit comments

Comments
 (0)