Skip to content

Commit c70261f

Browse files
committed
github: Compile i686 libcxx tests with an x86_64 build of the compiler
Some tests in the libcxx testsuite require more than 2 GB of memory to compile currently.
1 parent 845805b commit c70261f

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@ jobs:
338338
strategy:
339339
fail-fast: false
340340
matrix:
341-
arch:
342-
- x86_64
343-
- i686
341+
include:
342+
- { arch: x86_64, prefix: i686-w64-mingw32- }
343+
- { arch: x86_64, prefix: }
344344
steps:
345345
- name: Install dependencies
346346
run: |
@@ -374,8 +374,8 @@ jobs:
374374
-DLIBCXX_ENABLE_WERROR=YES `
375375
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" `
376376
-DLIBCXX_CXX_ABI=libcxxabi `
377-
-DCMAKE_C_COMPILER=clang `
378-
-DCMAKE_CXX_COMPILER=clang++ `
377+
-DCMAKE_C_COMPILER=${{matrix.prefix}}clang `
378+
-DCMAKE_CXX_COMPILER=${{matrix.prefix}}clang++ `
379379
-DLIBCXXABI_ENABLE_SHARED=NO `
380380
-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES `
381381
-DLIBCXX_USE_COMPILER_RT=YES `

.github/workflows/test-libcxx.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
strategy:
4545
fail-fast: false
4646
matrix:
47-
arch:
48-
- x86_64
49-
- i686
47+
include:
48+
- { arch: x86_64, prefix: i686-w64-mingw32- }
49+
- { arch: x86_64, prefix: }
5050
steps:
5151
- name: Install dependencies
5252
run: |
@@ -86,8 +86,8 @@ jobs:
8686
-DLIBCXX_ENABLE_WERROR=YES `
8787
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" `
8888
-DLIBCXX_CXX_ABI=libcxxabi `
89-
-DCMAKE_C_COMPILER=clang `
90-
-DCMAKE_CXX_COMPILER=clang++ `
89+
-DCMAKE_C_COMPILER=${{matrix.prefix}}clang `
90+
-DCMAKE_CXX_COMPILER=${{matrix.prefix}}clang++ `
9191
-DLIBCXXABI_ENABLE_SHARED=NO `
9292
-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES `
9393
-DLIBCXX_USE_COMPILER_RT=YES `

0 commit comments

Comments
 (0)