Merge pull request #910 from dpaoliello/arm64ec

Add support for ARM64EC when building with MSVC
rust-lang · Jan 5, 2024 · f17047d · f17047d
2 parents 8f730e4 + 2f0acd1
commit f17047d
Show file tree

Hide file tree

Showing 2 changed files with 97 additions and 60 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1933,6 +1933,8 @@ impl Build {
                 } else {
                     if target.contains("i586") {
                         cmd.push_cc_arg("-arch:IA32".into());
+                    } else if target.contains("arm64ec") {
+                        cmd.push_cc_arg("-arm64EC".into());
                     }
                 }
 
@@ -3017,10 +3019,14 @@ impl Build {
 
                     if lib.is_empty() {
                         name = String::from("lib.exe");
-                        match windows_registry::find(&target, "lib.exe") {
+                        let mut cmd = match windows_registry::find(&target, "lib.exe") {
                             Some(t) => t,
                             None => self.cmd("lib.exe"),
+                        };
+                        if target.contains("arm64ec") {
+                            cmd.arg("/machine:arm64ec");
                         }
+                        cmd
                     } else {
                         name = lib;
                         self.cmd(&name)