Skip to content

Commit 41febce

Browse files
authored
Update buildbinaryen.yml.
1 parent 323acad commit 41febce

1 file changed

Lines changed: 11 additions & 13 deletions

File tree

.github/workflows/buildbinaryen.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ jobs:
1010
include:
1111
- os: windows-latest
1212
arch: x64
13-
cmake-args: -A x64 -T ClangCL -DCMAKE_CXX_FLAGS="/W0 /MT" -DBUILD_STATIC_LIB=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
13+
cmake-args: -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="-W0 -m64 -static" -DBUILD_STATIC_LIB=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
1414
runtime: win-x64
1515
- os: windows-latest
1616
arch: x86
17-
cmake-args: -A Win32 -T ClangCL -DCMAKE_CXX_FLAGS="/W0 /MT" -DBUILD_STATIC_LIB=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
17+
cmake-args: -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="-W0 -m32 -static" -DBUILD_STATIC_LIB=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
1818
runtime: win-x86
1919
- os: ubuntu-latest
2020
arch: x64
21-
cmake-args: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="-m64 -w -static-libgcc -static-libstdc++" -DCMAKE_CXX_FLAGS="-m64 -w -static-libgcc -static-libstdc++" -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
21+
cmake-args: -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="-m64 -w -static-libgcc -static-libstdc++" -DCMAKE_CXX_FLAGS="-m64 -w -static-libgcc -static-libstdc++" -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
2222
runtime: linux-x64
2323
- os: ubuntu-latest
2424
arch: x86
25-
cmake-args: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="-m32 -w -static-libgcc -static-libstdc++" -DCMAKE_CXX_FLAGS="-m32 -w -static-libgcc -static-libstdc++" -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
25+
cmake-args: -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="-m32 -w -static-libgcc -static-libstdc++" -DCMAKE_CXX_FLAGS="-m32 -w -static-libgcc -static-libstdc++" -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
2626
runtime: linux-x86
2727

2828
runs-on: ${{ matrix.os }}
@@ -36,19 +36,17 @@ jobs:
3636
if: runner.os == 'Linux'
3737
run: |
3838
sudo apt-get update
39-
sudo apt-get install -y clang clang-tools cmake make gcc-multilib g++-multilib
39+
sudo apt-get install -y clang clang-tools cmake ninja-build gcc-multilib g++-multilib
40+
41+
- name: Install build deps (Windows)
42+
if: runner.os == 'Windows'
43+
run: choco install llvm ninja cmake --no-progress --yes
4044

4145
- name: Configure
4246
run: cmake -S binaryen -B binaryen/build ${{ matrix.cmake-args }}
4347

44-
- name: Build (Linux)
45-
if: runner.os == 'Linux'
46-
run: cmake --build binaryen/build -- -j$(nproc)
47-
48-
- name: Build (Windows)
49-
if: runner.os == 'Windows'
50-
run: cmake --build binaryen/build --config Release -- /m
51-
shell: pwsh
48+
- name: Build
49+
run: cmake --build binaryen/build -- -j$(nproc || sysctl -n hw.ncpu)
5250

5351
- name: Copy to NuGet runtime folder
5452
run: |

0 commit comments

Comments
 (0)