Support +crt-static through cargo xwin (#938)

justsmth · web-flow · commit 75eae54b2c2e · 2025-11-10T18:21:09.000-05:00
* Improve handling of +crt-static builds

* Fix clippy

* Also host cargo-xwin on Windows
diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
@@ -246,29 +246,74 @@ jobs:
 
   cargo-xwin:
     if: github.repository_owner == 'aws'
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.host }}
+    strategy:
+      fail-fast: false
+      matrix:
+        host:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+          - windows-11-arm
+        target:
+          - "x86_64-pc-windows-msvc"
+          - "aarch64-pc-windows-msvc"
+        crt_static:
+          - "0"
+          - "1"
     steps:
       - name: Install build dependencies
-        # cargo-xwin apparently require ninja-build
+        if: matrix.host == 'ubuntu-latest'
+        # cargo-xwin apparently requires ninja-build
         run: |
-          sudo apt-get update && sudo apt-get install --assume-yes nasm clang ninja-build llvm
+          sudo apt-get update && sudo apt-get install --assume-yes nasm ninja-build llvm
+      - name: Install build dependencies
+        if: matrix.host == 'macos-latest'
+        run: |
+          brew install nasm ninja llvm
       - uses: actions/checkout@v3
         with:
           submodules: "recursive"
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          target: x86_64-pc-windows-msvc
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: stable
-          target: aarch64-pc-windows-msvc
-      - name: Install cargo-xwin and bindgen-cli
-        run: cargo install --locked cargo-xwin bindgen-cli
-      - name: cargo xwin build for `x86_64-pc-windows-msvc`
-        run: cargo xwin build -p aws-lc-rs --release --all-targets --target x86_64-pc-windows-msvc
-      - name: cargo xwin build for `aarch64-pc-windows-msvc`
-        run: cargo xwin build -p aws-lc-rs --release --all-targets --target aarch64-pc-windows-msvc
+          target: ${{ matrix.target }}
+      - name: Install cargo-xwin
+        run: cargo install --locked cargo-xwin
+      - name: Set RUSTFLAGS
+        if: contains(matrix.host, 'windows') != true
+        run: |
+          if [[ '${{ matrix.crt_static }}' == '1' ]]; then
+            echo "RUSTFLAGS=-Clink-arg=/WX -Ctarget-feature=+crt-static" >> $GITHUB_ENV
+          else
+            echo "RUSTFLAGS=-Clink-arg=/WX" >> $GITHUB_ENV
+          fi
+          echo "EXTRA_FLAGS=" >> $GITHUB_ENV
+      - name: Set RUSTFLAGS
+        if: contains(matrix.host, 'windows')
+        run: |
+          if ('${{ matrix.crt_static }}' -eq '1') {
+            echo "RUSTFLAGS=-Clink-arg=/WX -Ctarget-feature=+crt-static" | Out-File -FilePath $env:GITHUB_ENV -Append
+          } else {
+            echo "RUSTFLAGS=-Clink-arg=/WX" | Out-File -FilePath $env:GITHUB_ENV -Append
+          }
+          if ('${{ matrix.host }}' -like '*arm*') {
+            echo "EXTRA_FLAGS=--features=prebuilt-nasm" | Out-File -FilePath $env:GITHUB_ENV -Append
+          } else {
+            echo "EXTRA_FLAGS=" | Out-File -FilePath $env:GITHUB_ENV -Append
+          }
+      - name: cargo xwin build for ${{ matrix.target }}
+        run: cargo xwin build -p aws-lc-rs --release --all-targets --target ${{ matrix.target }} ${{ env.EXTRA_FLAGS }}
+      - name: cargo test for x86_64-pc-windows-msvc
+        if: matrix.host == 'windows-latest' && matrix.target == 'x86_64-pc-windows-msvc'
+        env:
+          CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_RUNNER: 'cmd.exe'
+        run: cargo xwin test -p aws-lc-rs --release --all-targets --target x86_64-pc-windows-msvc ${{ env.EXTRA_FLAGS }}
+      - name: cargo test for aarch64-pc-windows-msvc
+        if: matrix.host == 'windows-11-arm' && matrix.target == 'aarch64-pc-windows-msvc'
+        env:
+          CARGO_TARGET_AARCH64_PC_WINDOWS_MSVC_RUNNER: 'cmd.exe'
+        run: cargo xwin test -p aws-lc-rs --release --all-targets --target aarch64-pc-windows-msvc ${{ env.EXTRA_FLAGS }}
 
   aws-lc-rs-windows-msvc:
     if: ${{ github.repository_owner == 'aws' }}
diff --git a/aws-lc-rs/build.rs b/aws-lc-rs/build.rs
@@ -34,6 +34,18 @@ fn main() {
         );
     };
 
+    // When using static CRT on Windows MSVC, ignore missing PDB file warnings
+    // The static CRT libraries reference PDB files from Microsoft's build servers
+    // which are not available during linking
+    if env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("windows")
+        && env::var("CARGO_CFG_TARGET_ENV").as_deref() == Ok("msvc")
+        && env::var("CARGO_CFG_TARGET_FEATURE")
+            .map(|features| features.contains("crt-static"))
+            .unwrap_or(false)
+    {
+        println!("cargo:rustc-link-arg=/ignore:4099");
+    }
+
     export_sys_vars(sys_crate);
 }
 
diff --git a/aws-lc-sys/CMakeLists.txt b/aws-lc-sys/CMakeLists.txt
@@ -3,13 +3,6 @@
 
 cmake_minimum_required(VERSION 3.5...3.31)
 
-if(CMAKE_VERSION VERSION_GREATER "3.14")
-# https://cmake.org/cmake/help/latest/policy/CMP0091.html
-# In CMake 3.14 and below, MSVC runtime library selection flags are added to the default CMAKE_<LANG>_FLAGS_<CONFIG>
-# cache entries by CMake automatically.
-cmake_policy(SET CMP0091 OLD)
-endif()
-
 project(AWS_LC_RUST NONE)
 enable_language(C)
 
diff --git a/aws-lc-sys/builder/cmake_builder.rs b/aws-lc-sys/builder/cmake_builder.rs
@@ -12,6 +12,7 @@ use crate::{
 use std::env;
 use std::ffi::OsString;
 use std::path::{Path, PathBuf};
+use std::str::FromStr;
 
 pub(crate) struct CmakeBuilder {
     manifest_dir: PathBuf,
@@ -164,12 +165,29 @@ impl CmakeBuilder {
         // are disabled.
         Self::preserve_cflag_optimization_flags(&mut cmake_cfg);
 
-        // Allow environment to specify CMake toolchain.
-        if let Some(toolchain) = optional_env_optional_crate_target("CMAKE_TOOLCHAIN_FILE") {
-            set_env_for_target("CMAKE_TOOLCHAIN_FILE", toolchain);
+        if target_os() == "windows" {
             if use_prebuilt_nasm() {
                 self.configure_prebuilt_nasm(&mut cmake_cfg);
             }
+            if target_env().as_str() == "msvc" {
+                let mut msvcrt = String::from_str("MultiThreaded").unwrap();
+                if is_crt_static() {
+                    cmake_cfg.static_crt(true);
+                    // When using static CRT on Windows MSVC, ignore missing PDB file warnings
+                    // The static CRT libraries reference PDB files from Microsoft's build servers
+                    // which are not available.
+                    println!("cargo:rustc-link-arg=/ignore:4099");
+                } else {
+                    msvcrt.push_str("DLL");
+                }
+                cmake_cfg.define("CMAKE_MSVC_RUNTIME_LIBRARY", msvcrt.as_str());
+            }
+        }
+
+        // Allow environment to specify CMake toolchain.
+        if let Some(toolchain) = optional_env_optional_crate_target("CMAKE_TOOLCHAIN_FILE") {
+            set_env_for_target("CMAKE_TOOLCHAIN_FILE", toolchain);
+
             return cmake_cfg;
         }
         // We only consider compiler CFLAGS when no cmake toolchain is set
@@ -286,6 +304,7 @@ impl CmakeBuilder {
         }
     }
 
+    #[allow(clippy::unused_self)]
     fn configure_windows(&self, cmake_cfg: &mut cmake::Config) {
         match (target_env().as_str(), target_arch().as_str()) {
             ("msvc", "aarch64") => {
@@ -303,21 +322,17 @@ impl CmakeBuilder {
                     ));
                     cmake_cfg.define("CMAKE_GENERATOR_PLATFORM", "ARM64");
                 }
-                cmake_cfg.static_crt(is_crt_static());
                 cmake_cfg.define("CMAKE_SYSTEM_NAME", "Windows");
                 cmake_cfg.define("CMAKE_SYSTEM_PROCESSOR", "ARM64");
             }
             ("msvc", _) => {
-                cmake_cfg.static_crt(is_crt_static());
+                // No-op
             }
             (_, arch) => {
                 cmake_cfg.define("CMAKE_SYSTEM_NAME", "Windows");
                 cmake_cfg.define("CMAKE_SYSTEM_PROCESSOR", arch);
             }
         }
-        if use_prebuilt_nasm() {
-            self.configure_prebuilt_nasm(cmake_cfg);
-        }
     }
 
     fn configure_prebuilt_nasm(&self, cmake_cfg: &mut cmake::Config) {
