Skip to content

fix(cargo-bazel): fallback qnx800 to qnx710 during target validation #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ShoroukRamzy wants to merge 1 commit into
base: score_main
Choose a base branch
from
Open

fix(cargo-bazel): fallback qnx800 to qnx710 during target validation #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions crate_universe/src/context/platforms.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,26 @@ pub(crate) fn resolve_cfg_platforms(
let target_infos = supported_platform_triples
.iter()
.map(
|target_triple| match get_builtin_target_by_triple(&target_triple.to_cargo()) {
Some(info) => Ok((target_triple, info)),
None => Err(anyhow!(
"Invalid platform triple in supported platforms: {}",
target_triple
)),
|target_triple| {
let triple_str = target_triple.to_cargo();
// Surgically intercept and map custom QNX8 triples to standard built-in QNX7 templates!
let lookup_str = if triple_str.contains("nto-qnx800") {
if triple_str.starts_with("aarch64") {
"aarch64-unknown-nto-qnx710"
} else {
"x86_64-pc-nto-qnx710"
}
} else {
&triple_str
};

match get_builtin_target_by_triple(lookup_str) {
Some(info) => Ok((target_triple, info)),
None => Err(anyhow!(
"Invalid platform triple in supported platforms: {}",
target_triple
)),
}
},
)
.collect::<Result<BTreeMap<&TargetTriple, &'static TargetInfo>>>()?;
Expand Down