Skip to content
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

Support i386 on OpenBSD #568

Merged
merged 2 commits into from Jun 16, 2021
Merged

Support i386 on OpenBSD #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35b8b52
Support i386 on OpenBSD
Jun 15, 2021
6b58517
Update Changelog
Jun 16, 2021
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
1 change: 1 addition & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Add PEP 656 musllinux support in [#543](https://github.com/PyO3/maturin/pull/543)
* `--manylinux` is now called `--compatibility` and supports musllinux
* The pure rust install layout changed from just the shared library to a python module that reexports the shared library. This should have now observable consequences for users of the created wheel expect that `my_project.my_project` is now also importable (and equal to just `my_project`)
* Support i386 on OpenBSD in [#568](https://github.com/PyO3/maturin/pull/568)

## 0.10.6 - 2021-05-21

Expand Down
10 changes: 9 additions & 1 deletion src/target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ fn get_supported_architectures(os: &Os) -> Vec<Arch> {
Os::Windows => vec![Arch::X86, Arch::X86_64, Arch::Aarch64],
Os::Macos => vec![Arch::Aarch64, Arch::X86_64],
Os::FreeBsd => vec![Arch::X86_64],
Os::OpenBsd => vec![Arch::X86_64],
Os::OpenBsd => vec![Arch::X86, Arch::X86_64],
}
}

Expand Down Expand Up @@ -150,6 +150,14 @@ impl Target {
let release = info.release().replace(".", "_").replace("-", "_");
format!("freebsd_{}_amd64", release)
}
(Os::OpenBsd, Arch::X86) => {
let info = match PlatformInfo::new() {
Ok(info) => info,
Err(error) => panic!("{}", error),
};
let release = info.release().replace(".", "_").replace("-", "_");
format!("openbsd_{}_i386", release)
}
(Os::OpenBsd, Arch::X86_64) => {
let info = match PlatformInfo::new() {
Ok(info) => info,
Expand Down