Skip to content

Commit

Permalink
Merge pull request #570 from dkarama/main
Browse files Browse the repository at this point in the history
Support Aarch64 on OpenBSD
  • Loading branch information
konstin authored Jun 17, 2021
2 parents 2272ee8 + 7455733 commit 1815107
Show file tree
Hide file tree
Showing 3 changed files with 712 additions and 2 deletions.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* `--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)
* Support Aarch64 on OpenBSD in [#570](https://github.com/PyO3/maturin/pull/570)

## 0.10.6 - 2021-05-21

Expand Down
6 changes: 4 additions & 2 deletions src/target.rs
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, Arch::X86_64],
Os::OpenBsd => vec![Arch::X86, Arch::X86_64, Arch::Aarch64],
}
}

Expand Down Expand Up @@ -144,7 +144,8 @@ impl Target {
match (&self.os, &self.arch) {
(Os::FreeBsd, Arch::X86_64)
| (Os::OpenBsd, Arch::X86)
| (Os::OpenBsd, Arch::X86_64) => {
| (Os::OpenBsd, Arch::X86_64)
| (Os::OpenBsd, Arch::Aarch64) => {
let info = match PlatformInfo::new() {
Ok(info) => info,
Err(error) => panic!("{}", error),
Expand All @@ -153,6 +154,7 @@ impl Target {
let arch = match self.arch {
Arch::X86_64 => "amd64",
Arch::X86 => "i386",
Arch::Aarch64 => "arm64",
_ => panic!(
"unsupported architecutre should not have reached get_platform_tag()"
),
Expand Down
Loading

0 comments on commit 1815107

Please sign in to comment.