Skip to content

Commit 0b70549

Browse files
committed
Build/Test for x86_64-pc-windows-gnullvm
1 parent 1c3fd9c commit 0b70549

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
@@ -298,6 +298,7 @@ jobs:
298298
- name: Run cargo test
299299
run: cargo build -p aws-lc-rs --features prebuilt-nasm --target x86_64-pc-windows-gnu
300300
open-harmony:
301+
if: github.repository_owner == 'aws'
301302
runs-on: ubuntu-latest
302303
env:
303304
DOCKER_BUILDKIT: 1
@@ -314,6 +315,7 @@ jobs:
314315
docker run -v "${{ github.workspace }}:/aws_lc_rs" ohos:5.0.0
315316
316317
alpine-linux:
318+
if: github.repository_owner == 'aws'
317319
runs-on: ubuntu-latest
318320
env:
319321
DOCKER_BUILDKIT: 1
@@ -328,3 +330,44 @@ jobs:
328330
- name: Build
329331
run: |
330332
docker run -v "${{ github.workspace }}:/aws_lc_rs" alpine:3.20
333+
334+
msys2:
335+
if: github.repository_owner == 'aws'
336+
name: ${{ matrix.sys }} - ${{ matrix.target }}
337+
runs-on: windows-latest
338+
strategy:
339+
fail-fast: false
340+
matrix:
341+
include:
342+
- { sys: mingw64, env: x86_64, target: x86_64-pc-windows-gnu, cc: gcc, rustflags: "" }
343+
- { sys: mingw32, env: i686, target: i686-pc-windows-gnu, cc: gcc, rustflags: "" }
344+
- { sys: ucrt64, env: ucrt-x86_64, target: x86_64-pc-windows-gnu, cc: gcc, rustflags: "" }
345+
- { sys: clang64, env: clang-x86_64, target: x86_64-pc-windows-gnullvm, cc: clang, rustflags: "-Clinker=clang" }
346+
steps:
347+
- uses: msys2/setup-msys2@v2
348+
with:
349+
msystem: ${{matrix.sys}}
350+
install: git base-devel mingw-w64-${{matrix.env}}-llvm
351+
release: true
352+
- run: git config --global core.autocrlf input
353+
- name: Install NASM
354+
uses: ilammy/[email protected]
355+
- name: Checkout
356+
uses: actions/checkout@v4
357+
with:
358+
submodules: "recursive"
359+
- uses: dtolnay/rust-toolchain@master
360+
id: toolchain
361+
with:
362+
toolchain: stable
363+
target: ${{matrix.target}}
364+
- name: Build
365+
env:
366+
CC: ${{matrix.cc}}
367+
RUSTFLAGS: ${{matrix.rustflags}}
368+
run: cargo build -p aws-lc-rs --target ${{matrix.target}} --features bindgen
369+
- name: Test
370+
env:
371+
CC: ${{matrix.cc}}
372+
RUSTFLAGS: ${{matrix.rustflags}}
373+
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)