Skip to content

support "vxworks" and "nto" OSes on get_base_archiver_variant #1456

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

Merged
merged 6 commits into from
May 15, 2025
Merged

support "vxworks" and "nto" OSes on get_base_archiver_variant #1456

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
82eec26
support "vxworks" and "nto" OSes on `get_base_archiver_variant`
onur-ozkan Apr 8, 2025
91646ce
improve target matching for Neutrino
onur-ozkan Apr 8, 2025
8301ac2
apply nits
onur-ozkan Apr 16, 2025
a1af860
add test coverage for archiver
onur-ozkan Apr 16, 2025
bb33e30
bless fmt
onur-ozkan Apr 16, 2025
e3b04dc
extend archiver coverage
onur-ozkan Apr 16, 2025
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
17 changes: 16 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2113,7 +2113,7 @@ impl Build {
// This assumes qcc/q++ as compiler, which is currently the only supported compiler for QNX.
// See for details: https://github.com/rust-lang/cc-rs/pull/1319
let arg = match target.arch {
"i586" => "-Vgcc_ntox86_cxx",
"i586" | "x86" => "-Vgcc_ntox86_cxx",
"aarch64" => "-Vgcc_ntoaarch64le_cxx",
"x86_64" => "-Vgcc_ntox86_64_cxx",
_ => {
Expand Down Expand Up @@ -3334,6 +3334,21 @@ impl Build {
// Use the GNU-variant to match other Unix systems.
name = format!("g{}", tool).into();
self.cmd(&name)
} else if target.os == "vxworks" {
name = format!("wr-{}", tool).into();
self.cmd(&name)
} else if target.os == "nto" {
name = match target.arch {
"i586" | "x86" => format!("ntox86-{}", tool).into(),
"aarch64" | "x86_64" => format!("nto{}-{}", target.arch, tool).into(),
_ => {
return Err(Error::new(
ErrorKind::InvalidTarget,
format!("Unknown architecture for Neutrino QNX: {}", target.arch),
))
}
};
self.cmd(&name)
} else if self.get_is_cross_compile()? {
match self.prefix_for_target(&self.get_raw_target()?) {
Some(prefix) => {
Expand Down
Loading