Raise target-lexicon version and update for API changes (#4822)

PyO3 · Dec 23, 2024 · 41bb532 · 41bb532
1 parent 14c5402
commit 41bb532
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/newsfragments/4822.changed.md b/newsfragments/4822.changed.md
@@ -0,0 +1 @@
+Bumped `target-lexicon` dependency to 0.13
diff --git a/pyo3-build-config/Cargo.toml b/pyo3-build-config/Cargo.toml
@@ -14,11 +14,11 @@ rust-version = "1.63"
 [dependencies]
 once_cell = "1"
 python3-dll-a = { version = "0.2.11", optional = true }
-target-lexicon = "0.12.14"
+target-lexicon = "0.13"
 
 [build-dependencies]
 python3-dll-a = { version = "0.2.11", optional = true }
-target-lexicon = "0.12.14"
+target-lexicon = "0.13"
 
 [features]
 default = []

diff --git a/pyo3-build-config/src/impl_.rs b/pyo3-build-config/src/impl_.rs
@@ -938,8 +938,8 @@ impl CrossCompileConfig {
             && host.operating_system == OperatingSystem::Windows;
 
         // Not cross-compiling to compile for x86-64 Python from macOS arm64 and vice versa
-        compatible |= target.operating_system == OperatingSystem::Darwin
-            && host.operating_system == OperatingSystem::Darwin;
+        compatible |= matches!(target.operating_system, OperatingSystem::Darwin(_))
+            && matches!(host.operating_system, OperatingSystem::Darwin(_));
 
         !compatible
     }

diff --git a/pyo3-build-config/src/lib.rs b/pyo3-build-config/src/lib.rs
@@ -65,7 +65,7 @@ pub fn add_extension_module_link_args() {
 }
 
 fn _add_extension_module_link_args(triple: &Triple, mut writer: impl std::io::Write) {
-    if triple.operating_system == OperatingSystem::Darwin {
+    if matches!(triple.operating_system, OperatingSystem::Darwin(_)) {
         writeln!(writer, "cargo:rustc-cdylib-link-arg=-undefined").unwrap();
         writeln!(writer, "cargo:rustc-cdylib-link-arg=dynamic_lookup").unwrap();
     } else if triple == &Triple::from_str("wasm32-unknown-emscripten").unwrap() {