Skip to content

Commit 6bd5cf3

Browse files
committed
Build/Test for x86_64-pc-windows-gnullvm
1 parent 028bcd9 commit 6bd5cf3

File tree

2 files changed

+59
-0
lines changed

2 files changed

+59
-0
lines changed

.github/workflows/cross.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ jobs:
309309
- name: Run cargo test
310310
run: cargo build -p aws-lc-rs --features prebuilt-nasm --target x86_64-pc-windows-gnu
311311
open-harmony:
312+
if: github.repository_owner == 'aws'
312313
runs-on: ubuntu-latest
313314
env:
314315
DOCKER_BUILDKIT: 1
@@ -325,6 +326,7 @@ jobs:
325326
docker run -v "${{ github.workspace }}:/aws_lc_rs" ohos:5.0.0
326327
327328
alpine-linux:
329+
if: github.repository_owner == 'aws'
328330
runs-on: ubuntu-latest
329331
env:
330332
DOCKER_BUILDKIT: 1
@@ -339,3 +341,56 @@ jobs:
339341
- name: Build
340342
run: |
341343
docker run -v "${{ github.workspace }}:/aws_lc_rs" alpine:3.20
344+
345+
msys2-clang:
346+
if: github.repository_owner == 'aws'
347+
runs-on: windows-latest
348+
env:
349+
AWS_LC_SYS_EXTERNAL_BINDGEN: 1
350+
strategy:
351+
fail-fast: false
352+
matrix:
353+
include:
354+
- { sys: mingw64, env: x86_64, target: x86_64-pc-windows-gnu, cc: gcc, cxx: g++ }
355+
- { sys: mingw32, env: i686, target: i686-pc-windows-gnu, cc: gcc, cxx: g++ }
356+
- { sys: ucrt64, env: ucrt-x86_64, target: x86_64-pc-windows-gnu, cc: gcc, cxx: g++ }
357+
- { sys: clang64, env: clang-x86_64, target: x86_64-pc-windows-gnullvm, cc: clang, cxx: g++ }
358+
steps:
359+
- name: Install MSYS2
360+
uses: msys2/setup-msys2@v2
361+
id: setup_msys2
362+
with:
363+
msystem: ${{ matrix.sys }}
364+
update: true
365+
pacboy: >-
366+
rust-bindgen
367+
cc
368+
nasm
369+
go
370+
- name: Update Environment
371+
shell: bash
372+
run: |
373+
echo "GOPATH=${{ steps.setup_msys2.outputs.msys2-location }}\${{ matrix.sys }}" >> $GITHUB_ENV
374+
echo "GOROOT=${{ steps.setup_msys2.outputs.msys2-location }}\${{ matrix.sys }}\lib\go" >> $GITHUB_ENV
375+
echo "CC=${{ steps.setup_msys2.outputs.msys2-location }}\${{ matrix.sys }}\bin\${{ matrix.cc }}.exe" >> $GITHUB_ENV
376+
echo "CXX=${{ steps.setup_msys2.outputs.msys2-location }}\${{ matrix.sys }}\bin\${{ matrix.cxx }}.exe" >> $GITHUB_ENV
377+
echo "${{ steps.setup_msys2.outputs.msys2-location }}\${{ matrix.sys }}\bin" >> $GITHUB_PATH
378+
- name: Fix bindgen clang64
379+
if: ${{ matrix.sys == 'clang64' }}
380+
shell: bash
381+
run: |
382+
CLANG_VERSION=$($CC --version | grep "clang version" | sed -e 's/clang version \([0-9]*\).*/\1/')
383+
echo "BINDGEN_EXTRA_CLANG_ARGS=-I${{ steps.setup_msys2.outputs.msys2-location }}\${{ matrix.sys }}\lib\clang\\${CLANG_VERSION}\include" >> $GITHUB_ENV
384+
- name: Checkout
385+
uses: actions/checkout@v4
386+
with:
387+
submodules: "recursive"
388+
- uses: dtolnay/rust-toolchain@master
389+
id: toolchain
390+
with:
391+
toolchain: stable
392+
target: ${{matrix.target}}
393+
- name: Build
394+
run: cargo build -p aws-lc-rs --target ${{matrix.target}} --features bindgen
395+
- name: Test
396+
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
@@ -273,6 +273,10 @@ impl CmakeBuilder {
273273
cmake_cfg.define("CMAKE_SYSTEM_NAME", "Windows");
274274
cmake_cfg.define("CMAKE_SYSTEM_PROCESSOR", "x86");
275275
}
276+
("gnullvm", arch) => {
277+
cmake_cfg.define("CMAKE_SYSTEM_NAME", "Windows");
278+
cmake_cfg.define("CMAKE_SYSTEM_PROCESSOR", arch);
279+
}
276280
_ => {}
277281
}
278282
if use_prebuilt_nasm() {

0 commit comments

Comments
 (0)