Add support for 32-bit x86 FreeBSD target

PyO3 · Nov 8, 2022 · 9b32578 · 9b32578
1 parent cb0b6c6
commit 9b32578
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 34 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -17,7 +17,7 @@ build_and_test: &BUILD_AND_TEST
 freebsd_task:
   name: Test (x86_64 FreeBSD)
   freebsd_instance:
-    image_family: freebsd-12-2
+    image_family: freebsd-13-1
   env:
     PATH: $HOME/.cargo/bin:$PATH
   registry_cache:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Changelog.md b/Changelog.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Use generic tags when `sys.implementation.name` != `platform.python_implementation()` in [#1232](https://github.com/PyO3/maturin/pull/1232).
   Fixes the compatibility tags for Pyston.
 * Set default macOS deployment target version if `MACOSX_DEPLOYMENT_TARGET` isn't specified in [#1251](https://github.com/PyO3/maturin/pull/1251)
+* Add support for 32-bit x86 FreeBSD target in [#1254](https://github.com/PyO3/maturin/pull/1254)
 
 ## [0.13.7] - 2022-10-29
 

diff --git a/src/target.rs b/src/target.rs
@@ -119,6 +119,7 @@ fn get_supported_architectures(os: &Os) -> Vec<Arch> {
             Arch::Aarch64,
             Arch::Powerpc64,
             Arch::Powerpc64Le,
+            Arch::X86,
             Arch::X86_64,
         ],
         Os::OpenBsd => vec![Arch::X86, Arch::X86_64, Arch::Aarch64],
@@ -227,7 +228,8 @@ impl Target {
     ) -> Result<String> {
         let tag = match (&self.os, &self.arch) {
             // FreeBSD
-            (Os::FreeBsd, Arch::X86_64)
+            (Os::FreeBsd, Arch::X86)
+            | (Os::FreeBsd, Arch::X86_64)
             | (Os::FreeBsd, Arch::Aarch64)
             | (Os::FreeBsd, Arch::Powerpc64)
             | (Os::FreeBsd, Arch::Powerpc64Le)