Skip to content

Commit f6dbe19

Browse files
committed
Revert "Update buildbinaryen.yml."
This reverts commit f4cb15c.
1 parent e6ecd1b commit f6dbe19

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

.github/workflows/buildbinaryen.yml

Lines changed: 6 additions & 12 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 -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="/W0 /MT" -DBUILD_STATIC_LIB=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
13+
cmake-args: -A x64 -DCMAKE_CXX_FLAGS="/W0 /MT" -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 -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="/W0 /MT" -DBUILD_STATIC_LIB=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
17+
cmake-args: -A Win32 -DCMAKE_CXX_FLAGS="/W0 /MT" -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: -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: -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,21 +36,15 @@ jobs:
3636
if: runner.os == 'Linux'
3737
run: |
3838
sudo apt-get update
39-
sudo apt-get install -y clang clang++ cmake make
40-
41-
- name: Install build deps (Windows)
42-
if: runner.os == 'Windows'
43-
run: |
44-
choco install llvm -y
45-
shell: pwsh
39+
sudo apt-get install -y g++-multilib gcc-multilib cmake make
4640
4741
- name: Configure
4842
run: cmake -S binaryen -B binaryen/build ${{ matrix.cmake-args }}
4943

5044
- name: Build (Linux)
5145
if: runner.os == 'Linux'
5246
run: cmake --build binaryen/build -- -j$(nproc)
53-
47+
5448
- name: Build (Windows)
5549
if: runner.os == 'Windows'
5650
run: cmake --build binaryen/build --config Release -- /m

0 commit comments

Comments
 (0)