Stuck w/ Ninja

justsmth · justsmth · commit a39cb367f012 · 2024-07-02T00:02:20.000-04:00
diff --git a/aws-lc-sys/builder/cmake_builder.rs b/aws-lc-sys/builder/cmake_builder.rs
@@ -146,12 +146,17 @@ impl CmakeBuilder {
                 cmake_cfg.define("CMAKE_SYSTEM_PROCESSOR", "");
             }
             if target_arch() == "aarch64" && target_env() == "msvc" {
+                cmake_cfg.generator("Ninja");
+                cmake_cfg.define("CMAKE_ASM_COMPILER_TARGET", "arm64-pc-windows-msvc");
+                cmake_cfg.define("CMAKE_ASM_COMPILER", "clang-cl");
+                /* TODO: Determine why assembly files aren't being built w/ default generator
                 #[cfg(target_arch = "x86_64")]
                 cmake_cfg.generator_toolset("ClangCL,host=x64");
                 #[cfg(target_arch = "x86")]
                 cmake_cfg.generator_toolset("ClangCL,host=x86");
                 #[cfg(not(any(target_arch = "x86_64", target_arch = "x86")))]
                 cmake_cfg.generator_toolset("ClangCL");
+                 */
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -146,12 +146,17 @@ impl CmakeBuilder {`
`146`	`146`	`cmake_cfg.define("CMAKE_SYSTEM_PROCESSOR", "");`
`147`	`147`	`}`
`148`	`148`	`if target_arch() == "aarch64" && target_env() == "msvc" {`
	`149`	`+ cmake_cfg.generator("Ninja");`
	`150`	`+ cmake_cfg.define("CMAKE_ASM_COMPILER_TARGET", "arm64-pc-windows-msvc");`
	`151`	`+ cmake_cfg.define("CMAKE_ASM_COMPILER", "clang-cl");`
	`152`	`+ /* TODO: Determine why assembly files aren't being built w/ default generator`
`149`	`153`	`#[cfg(target_arch = "x86_64")]`
`150`	`154`	`cmake_cfg.generator_toolset("ClangCL,host=x64");`
`151`	`155`	`#[cfg(target_arch = "x86")]`
`152`	`156`	`cmake_cfg.generator_toolset("ClangCL,host=x86");`
`153`	`157`	`#[cfg(not(any(target_arch = "x86_64", target_arch = "x86")))]`
`154`	`158`	`cmake_cfg.generator_toolset("ClangCL");`
	`159`	`+ */`
`155`	`160`	`}`
`156`	`161`	`}`
`157`	`162`