CI for cross-compiling to x86_64-pc-windows-gnu

aws · May 3, 2024 · 1e3c00f · 1e3c00f
1 parent a31328e
commit 1e3c00f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
@@ -41,6 +41,7 @@ jobs:
           - x86_64-unknown-linux-musl
           - aarch64-unknown-linux-musl
           - s390x-unknown-linux-gnu
+          - x86_64-pc-windows-gnu
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/aws-lc-sys/builder/cmake_builder.rs b/aws-lc-sys/builder/cmake_builder.rs
@@ -134,7 +134,7 @@ impl CmakeBuilder {
                 cmake_cfg.define("CMAKE_SYSTEM_PROCESSOR", "x86_64");
             }
         }
-        if (target_env() != "msvc") && test_ninja_command() {
+        if target_env() != "msvc" && test_ninja_command() {
             // Use Ninja if available
             cmake_cfg.generator("Ninja");
         }

diff --git a/docker/linux-cross/Dockerfile b/docker/linux-cross/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && \
     apt-get install --assume-yes --no-install-recommends  software-properties-common && \
     add-apt-repository --yes ppa:longsleep/golang-backports && \
     apt-get update && \
-    apt-get install --assume-yes --no-install-recommends build-essential cmake golang-go && \
+    apt-get install --assume-yes --no-install-recommends build-essential cmake golang-go nasm clang && \
     git config --global --add safe.directory '*' && \
     rm -rf /tmp/*