Skip to content

Commit ba50742

Browse files
authored
Revert changes to emscripten.yml
1 parent dac84d8 commit ba50742

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

.github/workflows/emscripten.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,13 +250,15 @@ jobs:
250250
brew link --overwrite "$pkg"
251251
done
252252
brew upgrade openssl >/dev/null 2>&1
253+
brew install ninja
253254
brew upgrade
254255
255256
- name: Install deps on Linux
256257
if: ${{ runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
257258
run: |
258259
# Install deps
259260
sudo apt-get update
261+
sudo apt-get install ninja-build
260262
sudo apt-get autoremove
261263
sudo apt-get clean
262264
@@ -298,8 +300,9 @@ jobs:
298300
-DLLVM_INCLUDE_EXAMPLES=OFF \
299301
-DLLVM_INCLUDE_TESTS=OFF \
300302
-DLLVM_ENABLE_THREADS=OFF \
303+
-G Ninja \
301304
../llvm
302-
emmake make clang cling lld gtest_main -j ${{ env.ncpus }}
305+
emmake ninja clang cling lld gtest_main -j ${{ env.ncpus }}
303306
else
304307
# Apply patches
305308
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -324,8 +327,9 @@ jobs:
324327
-DLLVM_INCLUDE_EXAMPLES=OFF \
325328
-DLLVM_INCLUDE_TESTS=OFF \
326329
-DLLVM_ENABLE_THREADS=OFF \
330+
-G Ninja \
327331
../llvm
328-
emmake make clang clangInterpreter clangStaticAnalyzerCore lld -j ${{ env.ncpus }}
332+
emmake ninja clang clangInterpreter clangStaticAnalyzerCore lld -j ${{ env.ncpus }}
329333
fi
330334
cd ../
331335
rm -rf $(find . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".")

0 commit comments

Comments
 (0)