From 0f2555f822caa95bbf00b27273f8ae340e5671d6 Mon Sep 17 00:00:00 2001
From: messense <messense@icloud.com>
Date: Fri, 20 Dec 2024 20:50:52 +0800
Subject: [PATCH] Upgrade target-lexicon to 0.13.0

---
 Cargo.lock           | 8 ++++----
 Cargo.toml           | 4 ++--
 src/build_context.rs | 5 ++++-
 src/target.rs        | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47a9d4dcc..f2e95a67c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -282,9 +282,9 @@ dependencies = [
 
 [[package]]
 name = "cargo-zigbuild"
-version = "0.19.5"
+version = "0.19.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb13fbc2ba490ac9eb0b359cf46ba265255424c04a172f1c1772a8b9532283d"
+checksum = "04cc649328f39bbf1ef92ef753406e1785ff1074941c398e5214b6c74d318a9e"
 dependencies = [
  "anyhow",
  "cargo-config2",
@@ -2486,9 +2486,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "4ff4a4048091358129767b8a200d6927f58876c8b5ea16fb7b0222d43b79bfa8"
 
 [[package]]
 name = "tempfile"
diff --git a/Cargo.toml b/Cargo.toml
index 1161f2886..9b050f883 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,7 +68,7 @@ fat-macho = { version = "0.4.8", default-features = false }
 once_cell = "1.7.2"
 rustc_version = "0.4.0"
 semver = "1.0.22"
-target-lexicon = "0.12.14"
+target-lexicon = "0.13.0"
 indexmap = "2.2.3"
 pyproject-toml = "0.11.0"
 python-pkginfo = "0.6.5"
@@ -97,7 +97,7 @@ clap = { version = "4.0.0", features = [
 clap_complete_command = { version = "0.6.1", optional = true }
 
 # cross compile
-cargo-zigbuild = { version = "0.19.5", default-features = false, optional = true }
+cargo-zigbuild = { version = "0.19.7", default-features = false, optional = true }
 cargo-xwin = { version = "0.17.5", default-features = false, optional = true }
 
 # log
diff --git a/src/build_context.rs b/src/build_context.rs
index 7afd51eb9..a0f75a081 100644
--- a/src/build_context.rs
+++ b/src/build_context.rs
@@ -1186,7 +1186,10 @@ pub(crate) fn rustc_macosx_target_version(target: &str) -> (u16, u16) {
             .context("llvm-target is not a string")?;
         let triple = llvm_target.parse::<target_lexicon::Triple>();
         let (major, minor) = match triple.map(|t| t.operating_system) {
-            Ok(OperatingSystem::MacOSX { major, minor, .. }) => (major, minor),
+            Ok(
+                OperatingSystem::MacOSX(Some(deployment_target))
+                | OperatingSystem::Darwin(Some(deployment_target)),
+            ) => (deployment_target.major, u16::from(deployment_target.minor)),
             _ => fallback_version,
         };
         Ok((major, minor))
diff --git a/src/target.rs b/src/target.rs
index def4c8bd6..b5084a9bf 100644
--- a/src/target.rs
+++ b/src/target.rs
@@ -249,8 +249,8 @@ impl Target {
         let os = match platform.operating_system {
             OperatingSystem::Linux => Os::Linux,
             OperatingSystem::Windows => Os::Windows,
-            OperatingSystem::MacOSX { .. } | OperatingSystem::Darwin => Os::Macos,
-            OperatingSystem::Ios => Os::Ios,
+            OperatingSystem::MacOSX(_) | OperatingSystem::Darwin(_) => Os::Macos,
+            OperatingSystem::IOS(_) => Os::Ios,
             OperatingSystem::Netbsd => Os::NetBsd,
             OperatingSystem::Freebsd => Os::FreeBsd,
             OperatingSystem::Openbsd => Os::OpenBsd,