Skip to content

Commit 9492481

Browse files
committed
WIP: Include arm64ec in test-libcxx and test-compiler-rt
1 parent 6de73b5 commit 9492481

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ jobs:
383383
- { arch: x86_64, target_arch: x86_64 }
384384
- { arch: aarch64, target_arch: armv7 }
385385
- { arch: aarch64, target_arch: aarch64 }
386+
- { arch: aarch64, target_arch: arm64ec }
386387
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
387388
steps:
388389
- name: Install dependencies
@@ -505,11 +506,12 @@ jobs:
505506
strategy:
506507
fail-fast: false
507508
matrix:
508-
arch:
509-
- x86_64
510-
- i686
511-
- armv7
512-
- aarch64
509+
include:
510+
- { arch: i686, target_arch: i686 }
511+
- { arch: x86_64, target_arch: x86_64 }
512+
- { arch: armv7, target_arch: armv7 }
513+
- { arch: aarch64, target_arch: aarch64 }
514+
- { arch: aarch64, target_arch: arm64ec }
513515
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
514516
steps:
515517
- name: Install dependencies
@@ -540,8 +542,8 @@ jobs:
540542
-G Ninja `
541543
-DCMAKE_BUILD_TYPE=Release `
542544
-DLLVM_TARGETS_TO_BUILD=X86 `
543-
-DCMAKE_C_COMPILER=clang `
544-
-DCMAKE_CXX_COMPILER=clang++
545+
-DCMAKE_C_COMPILER=${{matrix.target_arch}}-w64-mingw32-clang `
546+
-DCMAKE_CXX_COMPILER=${{matrix.target_arch}}-w64-mingw32-clang++
545547
ninja not FileCheck llvm-config KillTheDoctor count split-file
546548
echo "LLVM_CONFIG=$PWD\bin\llvm-config.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
547549
echo "CMAKE_DIR=$PWD\lib\cmake\llvm" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
@@ -559,9 +561,9 @@ jobs:
559561
-G Ninja `
560562
-DCMAKE_BUILD_TYPE=Release `
561563
-DPython3_EXECUTABLE="$Env:PYTHON_EXE" `
562-
-DCMAKE_C_COMPILER=clang `
563-
-DCMAKE_CXX_COMPILER=clang++ `
564-
-DCMAKE_C_COMPILER_TARGET=${{matrix.arch}}-w64-windows-gnu `
564+
-DCMAKE_C_COMPILER=${{matrix.target_arch}}-w64-mingw32-clang `
565+
-DCMAKE_CXX_COMPILER=${{matrix.target_arch}}-w64-mingw32-clang++
566+
-DCMAKE_C_COMPILER_TARGET=${{matrix.target_arch}}-w64-windows-gnu `
565567
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE `
566568
-DCOMPILER_RT_USE_BUILTINS_LIBRARY=TRUE `
567569
-DLLVM_CONFIG_PATH="$Env:LLVM_CONFIG" `

0 commit comments

Comments
 (0)