Update xwin to 0.2.8

rust-cross · Sep 7, 2022 · 310463f · 310463f
1 parent 236b55f
commit 310463f
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ fs-err = "2.7.0"
 indicatif = "0.17.0"
 path-slash = "0.2.0"
 which = "4.2.4"
-xwin = { version = "0.2.6", default-features = false }
+xwin = { version = "0.2.8", default-features = false }
 
 [features]
 # By default we use rustls for TLS

diff --git a/src/common.rs b/src/common.rs
@@ -235,7 +235,7 @@ impl XWinOptions {
             .xwin_variant
             .iter()
             .fold(0, |acc, var| acc | *var as u32);
-        let pruned = xwin::prune_pkg_list(&pkg_manifest, arches, variants)?;
+        let pruned = xwin::prune_pkg_list(&pkg_manifest, arches, variants, false)?;
         let op = xwin::Ops::Splat(xwin::SplatConfig {
             include_debug_libs: false,
             include_debug_symbols: false,
@@ -252,13 +252,20 @@ impl XWinOptions {
         .map(|pay| {
             let prefix = match pay.kind {
                 xwin::PayloadKind::CrtHeaders => "CRT.headers".to_owned(),
+                xwin::PayloadKind::AtlHeaders => "ATL.headers".to_owned(),
                 xwin::PayloadKind::CrtLibs => {
                     format!(
                         "CRT.libs.{}.{}",
                         pay.target_arch.map(|ta| ta.as_str()).unwrap_or("all"),
                         pay.variant.map(|v| v.as_str()).unwrap_or("none")
                     )
                 }
+                xwin::PayloadKind::AtlLibs => {
+                    format!(
+                        "ATL.libs.{}",
+                        pay.target_arch.map(|ta| ta.as_str()).unwrap_or("all"),
+                    )
+                }
                 xwin::PayloadKind::SdkHeaders => {
                     format!(
                         "SDK.headers.{}.{}",