Skip to content

Commit

Permalink
Add support for x86_64h-apple-darwin target (#1717)
Browse files Browse the repository at this point in the history
* Add support for `x86_64h-apple-darwin` target

* Fix pyo3_mixed_implicit test
  • Loading branch information
messense authored Aug 6, 2023
1 parent e627ed4 commit 70c6b47
Show file tree
Hide file tree
Showing 26 changed files with 1,260 additions and 1,013 deletions.
59 changes: 31 additions & 28 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

* Add basic support for implicit namespaces [#1645](https://github.com/PyO3/maturin/pull/1696)
* Add Linux mips64 and mips architecture support in [#1712](https://github.com/PyO3/maturin/pull/1712)
* Add `x86_64h-apple-darwin` target support in [#1717](https://github.com/PyO3/maturin/pull/1717)

## [1.1.0] - 2023-06-10

Expand Down
2 changes: 1 addition & 1 deletion src/target.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ impl Target {
};

let arch = match platform.architecture {
Architecture::X86_64 => Arch::X86_64,
Architecture::X86_64 | Architecture::X86_64h => Arch::X86_64,
Architecture::X86_32(_) => Arch::X86,
Architecture::Arm(arm_arch) => match arm_arch {
ArmArchitecture::Arm | ArmArchitecture::Armv6 => Arch::Armv6L,
Expand Down
60 changes: 30 additions & 30 deletions test-crates/cargo-mock/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions test-crates/cargo-update.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash
for d in ./*; do
if [ -d "$d" ]; then
if [ -f "$d/Cargo.lock" ]; then
cargo update --manifest-path "$d/Cargo.toml"
echo "$d updated"
fi
fi
done
Loading

0 comments on commit 70c6b47

Please sign in to comment.