Skip to content

Commit 8f52637

Browse files
committed
Build/Test for x86_64-pc-windows-gnullvm
1 parent f6addd3 commit 8f52637

File tree

2 files changed

+47
-0
lines changed

2 files changed

+47
-0
lines changed

.github/workflows/cross.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ jobs:
308308
- name: Run cargo test
309309
run: cargo build -p aws-lc-rs --features prebuilt-nasm --target x86_64-pc-windows-gnu
310310
open-harmony:
311+
if: github.repository_owner == 'aws'
311312
runs-on: ubuntu-latest
312313
env:
313314
DOCKER_BUILDKIT: 1
@@ -324,6 +325,7 @@ jobs:
324325
docker run -v "${{ github.workspace }}:/aws_lc_rs" ohos:5.0.0
325326
326327
alpine-linux:
328+
if: github.repository_owner == 'aws'
327329
runs-on: ubuntu-latest
328330
env:
329331
DOCKER_BUILDKIT: 1
@@ -338,3 +340,44 @@ jobs:
338340
- name: Build
339341
run: |
340342
docker run -v "${{ github.workspace }}:/aws_lc_rs" alpine:3.20
343+
344+
msys2:
345+
if: github.repository_owner == 'aws'
346+
name: ${{ matrix.sys }} - ${{ matrix.target }}
347+
runs-on: windows-latest
348+
strategy:
349+
fail-fast: false
350+
matrix:
351+
include:
352+
- { sys: mingw64, env: x86_64, target: x86_64-pc-windows-gnu, cc: gcc, rustflags: "" }
353+
- { sys: mingw32, env: i686, target: i686-pc-windows-gnu, cc: gcc, rustflags: "" }
354+
- { sys: ucrt64, env: ucrt-x86_64, target: x86_64-pc-windows-gnu, cc: gcc, rustflags: "" }
355+
- { sys: clang64, env: clang-x86_64, target: x86_64-pc-windows-gnullvm, cc: clang, rustflags: "-Clinker=clang" }
356+
steps:
357+
- uses: msys2/setup-msys2@v2
358+
with:
359+
msystem: ${{matrix.sys}}
360+
install: git base-devel mingw-w64-${{matrix.env}}-llvm
361+
release: true
362+
- run: git config --global core.autocrlf input
363+
- name: Install NASM
364+
uses: ilammy/[email protected]
365+
- name: Checkout
366+
uses: actions/checkout@v4
367+
with:
368+
submodules: "recursive"
369+
- uses: dtolnay/rust-toolchain@master
370+
id: toolchain
371+
with:
372+
toolchain: stable
373+
target: ${{matrix.target}}
374+
- name: Build
375+
env:
376+
CC: ${{matrix.cc}}
377+
RUSTFLAGS: ${{matrix.rustflags}}
378+
run: cargo build -p aws-lc-rs --target ${{matrix.target}} --features bindgen
379+
- name: Test
380+
env:
381+
CC: ${{matrix.cc}}
382+
RUSTFLAGS: ${{matrix.rustflags}}
383+
run: cargo test -p aws-lc-rs --target ${{matrix.target}} --features bindgen

aws-lc-sys/builder/cmake_builder.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,10 @@ impl CmakeBuilder {
263263
cmake_cfg.define("CMAKE_SYSTEM_NAME", "Windows");
264264
cmake_cfg.define("CMAKE_SYSTEM_PROCESSOR", "x86");
265265
}
266+
("gnullvm", arch) => {
267+
cmake_cfg.define("CMAKE_SYSTEM_NAME", "Windows");
268+
cmake_cfg.define("CMAKE_SYSTEM_PROCESSOR", arch);
269+
}
266270
_ => {}
267271
}
268272
if use_prebuilt_nasm() {

0 commit comments

Comments
 (0)