Test msys2 w/ prebuilt-nasm (#830)

* Test msys2 w/ prebuilt-nasm

* Select appropriate prebuilt-nasm script

* CI properly cover msys2

* Generate warning when NASM test fails

Author: justsmth

.github/workflows/cross.yml

@@ -313,17 +313,25 @@ jobs:
           docker run -v "${{ github.workspace }}:/aws_lc_rs" alpine:3.20
 
   msys2:
+    name: msys2 ${{ matrix.sys }} - ${{ matrix.nasm }}, ${{ matrix.generator }}
     if: github.repository_owner == 'aws'
     runs-on: windows-latest
     env:
       AWS_LC_SYS_EXTERNAL_BINDGEN: 1
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - { sys: mingw64 }
-          - { sys: ucrt64 }
-          - { sys: clang64 }
+        sys:
+          - mingw64
+          - ucrt64
+          - clang64
+        nasm:
+          - 'prebuilt'
+          - 'nasm'
+        generator:
+          - ninja
+          - msys
+          - mingw
     steps:
       - name: Install MSYS2
         uses: msys2/setup-msys2@v2
@@ -332,28 +340,44 @@ jobs:
           msystem: ${{ matrix.sys }}
           update: true
           pacboy: >-
+            cmake
             toolchain
+            llvm
             rust
             rust-bindgen
             ninja
             cc
-            nasm
             go
+            ${{ (matrix.nasm == 'nasm' && 'nasm') || 'make' }}
       - name: Update Environment
         shell: bash
         run: |
           SYSROOT=$(cygpath -a -m '${{ steps.setup_msys2.outputs.msys2-location }}\${{ matrix.sys }}')
+          echo "AWS_LC_SYS_PREBUILT_NASM=${{ (matrix.nasm == 'nasm' && '0') || '1' }}" >> $GITHUB_ENV
           echo "BINDGEN_EXTRA_CLANG_ARGS=-target x86_64-pc-windows-gnu" >> $GITHUB_ENV
           echo "GOPATH=${SYSROOT}" >> $GITHUB_ENV
           echo "GOROOT=${SYSROOT}/lib/go" >> $GITHUB_ENV
+          cygpath -w ${SYSROOT}/bin >> $GITHUB_PATH
+      - name: Set CMAKE_GENERATOR
+        if: matrix.generator == 'ninja'
+        shell: bash
+        run: |
           echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV
+      - name: Set LIBCLANG_PATH
+        if: matrix.generator == 'msys'
+        shell: bash
+        run: |
+          SYSROOT=$(cygpath -a -m '${{ steps.setup_msys2.outputs.msys2-location }}\${{ matrix.sys }}')
           echo "LIBCLANG_PATH=${SYSROOT}/lib" >> $GITHUB_ENV
-          cygpath -w ${SYSROOT}/bin >> $GITHUB_PATH
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: "recursive"
-      - name: Build
-        run: cargo build --verbose --features bindgen --release -p aws-lc-rs
       - name: Test
-        run: cargo test --verbose --features bindgen -p aws-lc-rs
+        if: matrix.generator != 'msys'
+        shell: bash
+        run: cargo test --verbose --features bindgen --release -p aws-lc-rs
+      - name: Test
+        if: matrix.generator == 'msys'
+        shell: msys2 {0}
+        run: cargo test --verbose --features bindgen --release -p aws-lc-rs

aws-lc-sys/builder/cmake_builder.rs

@@ -11,7 +11,7 @@ use crate::{
 };
 use std::env;
 use std::ffi::OsString;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 pub(crate) struct CmakeBuilder {
     manifest_dir: PathBuf,
@@ -24,6 +24,11 @@ fn test_clang_cl_command() -> bool {
     execute_command("clang-cl".as_ref(), &["--version".as_ref()]).status
 }
 
+fn test_prebuilt_nasm_script(script_path: &Path) -> bool {
+    // Call with no args - both scripts will exit with error, but we only care if they can execute
+    execute_command(script_path.as_os_str(), &[]).executed
+}
+
 fn find_cmake_command() -> Option<OsString> {
     if let Some(cmake) = optional_env_optional_crate_target("CMAKE") {
         emit_warning(&format!(
@@ -216,6 +221,35 @@ impl CmakeBuilder {
         }
     }
 
+    #[allow(clippy::unused_self)]
+    fn select_prebuilt_nasm_script(&self) -> PathBuf {
+        let sh_script = self.manifest_dir.join("builder").join("prebuilt-nasm.sh");
+        let bat_script = self.manifest_dir.join("builder").join("prebuilt-nasm.bat");
+
+        // Test .sh first (more universal - works in MSYS2, WSL, native Unix)
+        if test_prebuilt_nasm_script(&sh_script) {
+            emit_warning("Selected prebuilt-nasm.sh (shell script can execute)");
+            sh_script
+        } else if test_prebuilt_nasm_script(&bat_script) {
+            emit_warning(
+                "Selected prebuilt-nasm.bat (batch script can execute, shell script cannot)",
+            );
+            bat_script
+        } else {
+            // Fallback to current logic if neither can execute
+            let fallback_script = if cfg!(target_os = "windows") {
+                bat_script
+            } else {
+                sh_script
+            };
+            emit_warning(
+                &format!(
+                    "Neither script could be tested for execution, falling back to target-based selection: {}", 
+                    fallback_script.file_name().unwrap().to_str().unwrap()));
+            fallback_script
+        }
+    }
+
     #[allow(clippy::unused_self)]
     fn configure_android(&self, _cmake_cfg: &mut cmake::Config) {
         // If we leave CMAKE_SYSTEM_PROCESSOR unset, then cmake-rs should handle properly setting
@@ -274,18 +308,8 @@ impl CmakeBuilder {
             emit_warning("!!!   Using pre-built NASM binaries   !!!");
             emit_warning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
 
-            let script_name = if cfg!(target_os = "windows") {
-                "prebuilt-nasm.bat"
-            } else {
-                "prebuilt-nasm.sh"
-            };
-
-            let script_path = self
-                .manifest_dir
-                .join("builder")
-                .join(script_name)
-                .display()
-                .to_string();
+            let script_path = self.select_prebuilt_nasm_script();
+            let script_path = script_path.display().to_string();
             let script_path = script_path.replace('\\', "/");
 
             cmake_cfg.define("CMAKE_ASM_NASM_COMPILER", script_path.as_str());
@@ -404,7 +428,9 @@ impl crate::Builder for CmakeBuilder {
             }
         }
         if let Some(cmake_cmd) = find_cmake_command() {
-            env::set_var("CMAKE", cmake_cmd);
+            unsafe {
+                env::set_var("CMAKE", cmake_cmd);
+            }
         } else {
             eprintln!("Missing dependency: cmake");
             missing_dependency = true;

aws-lc-sys/builder/main.rs

@@ -629,7 +629,11 @@ fn has_pregenerated() -> bool {
 }
 
 fn test_nasm_command() -> bool {
-    execute_command("nasm".as_ref(), &["-version".as_ref()]).status
+    let status = execute_command("nasm".as_ref(), &["-version".as_ref()]).status;
+    if !status {
+        emit_warning("NASM command not found or failed to execute.");
+    }
+    status
 }
 
 fn prepare_cargo_cfg() {

aws-lc-sys/builder/prebuilt-nasm.bat

@@ -13,7 +13,9 @@ goto loop
 shift
 set "path=%~1"
 for %%f in ("%path%") do set "filename=%%~nxf"
-copy "%ScriptDir%\prebuilt-nasm\%filename%" "%path%"
+REM Extract the base filename before the first dot, similar to the shell script
+for /f "tokens=1 delims=." %%a in ("%filename%") do set "basename=%%a"
+copy "%ScriptDir%\prebuilt-nasm\%basename%.obj" "%path%"
 exit 0
 
 :failure