diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel index c674565..4371684 100644 --- a/examples/MODULE.bazel +++ b/examples/MODULE.bazel @@ -116,7 +116,7 @@ gcc.toolchain( # ******************************************************************************* gcc.toolchain( name = "score_qcc_toolchain", - sdp_version = "8.0.3", + sdp_version = "8.0.4", target_cpu = "x86_64", target_os = "qnx", use_default_package = True, diff --git a/examples/MODULE.bazel.lock b/examples/MODULE.bazel.lock index bbfa96d..2ececf1 100644 --- a/examples/MODULE.bazel.lock +++ b/examples/MODULE.bazel.lock @@ -2054,8 +2054,8 @@ }, "@@score_bazel_cpp_toolchains+//extensions:gcc.bzl%gcc": { "general": { - "bzlTransitiveDigest": "S3P8j4x4Dv6bMa6UG1VGbWiXBX2JINdnL5NIbj36NsA=", - "usagesDigest": "unK8CU54SxQZb3A5+/fOy5ZHARy5jWDy5NpNfcCVyNA=", + "bzlTransitiveDigest": "iHllDaAh23UGIAhthWRzzGTXxg8CEpo6eu2u8j8xep0=", + "usagesDigest": "UGWjRneAyNFej8g6SWlPfmeiX8/dwQzCLxr5gub4nN4=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -2108,10 +2108,10 @@ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { "urls": [ - "https://www.qnx.com/download/download/87174/installation_qnx_803_260305.tar.xz" + "https://www.qnx.com/download/download/88447/installation_qnx_804_260520.tar.xz" ], "build_file": "@@score_bazel_cpp_toolchains+//packages/qnx/x86_64/sdp/8.0.0:sdp.BUILD", - "sha256": "9039fd6a4a639f06ea977afb93963a6fe8f8c46db727066709370d999c7232e0", + "sha256": "146312c0bf22aab66e8294a06403f2ec6cfeeb074d8fa11549faffd84b7fe778", "strip_prefix": "" } }, @@ -2261,7 +2261,7 @@ "license_info_value": "", "license_path": "/opt/score_qnx/license/licenses", "sdk_version": "", - "sdp_version": "8.0.3", + "sdp_version": "8.0.4", "tc_compiler_library_search_paths": [], "tc_cpu": "x86_64", "tc_identifier": "sdp_8.0.0", diff --git a/extensions/gcc.bzl b/extensions/gcc.bzl index 102b5d9..5b00c28 100644 --- a/extensions/gcc.bzl +++ b/extensions/gcc.bzl @@ -272,7 +272,7 @@ def _resolve_identifier(toolchain_info): version = toolchain_info["sdk_version"] elif toolchain_info["sdp_version"] != "": identifier = "sdp" - version = "8.0.0" if toolchain_info["sdp_version"] == "8.0.3" else toolchain_info["sdp_version"] # FIXME: currently we do not support constraint "8.0.3". + version = "8.0.0" if toolchain_info["sdp_version"] == "8.0.4" else toolchain_info["sdp_version"] # FIXME: currently we do not support constraint "8.0.4". return "{}_{}".format(identifier, version) diff --git a/packages/version_matrix.bzl b/packages/version_matrix.bzl index 8a6cbb3..9e96d6e 100644 --- a/packages/version_matrix.bzl +++ b/packages/version_matrix.bzl @@ -73,11 +73,11 @@ VERSION_MATRIX = { "url": "https://www.qnx.com/download/download/79858/installation.tgz", "gcc_version": "12.2.0", }, - "aarch64-qnx-sdp_8.0.3": { + "aarch64-qnx-sdp_8.0.4": { "build_file": "@score_bazel_cpp_toolchains//packages/qnx/aarch64/sdp/8.0.0:sdp.BUILD", - "sha256": "9039fd6a4a639f06ea977afb93963a6fe8f8c46db727066709370d999c7232e0", + "sha256": "146312c0bf22aab66e8294a06403f2ec6cfeeb074d8fa11549faffd84b7fe778", "strip_prefix": "", - "url": "https://www.qnx.com/download/download/87174/installation_qnx_803_260305.tar.xz", + "url": "https://www.qnx.com/download/download/88447/installation_qnx_804_260520.tar.xz", "gcc_version": "12.2.0", }, "x86_64-linux-gcc_12.2.0": { @@ -200,11 +200,11 @@ VERSION_MATRIX = { "url": "https://www.qnx.com/download/download/79858/installation.tgz", "gcc_version": "12.2.0", }, - "x86_64-qnx-sdp_8.0.3": { + "x86_64-qnx-sdp_8.0.4": { "build_file": "@score_bazel_cpp_toolchains//packages/qnx/x86_64/sdp/8.0.0:sdp.BUILD", - "sha256": "9039fd6a4a639f06ea977afb93963a6fe8f8c46db727066709370d999c7232e0", + "sha256": "146312c0bf22aab66e8294a06403f2ec6cfeeb074d8fa11549faffd84b7fe778", "strip_prefix": "", - "url": "https://www.qnx.com/download/download/87174/installation_qnx_803_260305.tar.xz", + "url": "https://www.qnx.com/download/download/88447/installation_qnx_804_260520.tar.xz", "gcc_version": "12.2.0", }, } diff --git a/rules/gcc.bzl b/rules/gcc.bzl index 576617e..891406b 100644 --- a/rules/gcc.bzl +++ b/rules/gcc.bzl @@ -180,7 +180,7 @@ def _impl(rctx): "%{license_info_value}": rctx.attr.license_info_value, "%{license_info_variable}": rctx.attr.license_info_variable, "%{license_path}": rctx.attr.license_path, - "%{sdp_version}": "8.0.0" if rctx.attr.sdp_version == "8.0.3" else rctx.attr.sdp_version, # FIXME: currently we do not support constraint "8.0.3". + "%{sdp_version}": "8.0.0" if rctx.attr.sdp_version == "8.0.4" else rctx.attr.sdp_version, # FIXME: currently we do not support constraint "8.0.4". "%{tc_cpu_cxx}": "aarch64le" if rctx.attr.tc_cpu == "aarch64" else rctx.attr.tc_cpu, "%{use_license_info}": "False" if rctx.attr.license_info_value == "" else "True", }