MSVC: Always specify when building 32-bit MSVC (#144)

VS2022 is out, and is not listed as one of the "must specify 32-bit" versions, therefore building 32-bit libraries with this broke. The easiest solution is to just always specify 32-bit when building for it.
rust-lang · Feb 23, 2022 · bfaf129 · bfaf129 · willox · Mar 26, 2022
1 parent 7793895
commit bfaf129
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -606,19 +606,10 @@ impl Config {
                     }
                     cmd.arg("-AARM64");
                 } else if target.contains("i686") {
-                    use cc::windows_registry::{find_vs_version, VsVers};
-                    match find_vs_version() {
-                        Ok(VsVers::Vs16) => {
-                            // 32-bit x86 toolset used to be the default for all hosts,
-                            // but Visual Studio 2019 changed the default toolset to match the host,
-                            // so we need to manually override it for x86 targets
-                            if self.generator_toolset.is_none() {
-                                cmd.arg("-Thost=x86");
-                            }
-                            cmd.arg("-AWin32");
-                        }
-                        _ => {}
-                    };
+                    if self.generator_toolset.is_none() {
+                        cmd.arg("-Thost=x86");
+                    }
+                    cmd.arg("-AWin32");
                 } else {
                     panic!("unsupported msvc target: {}", target);
                 }