@@ -250,15 +250,13 @@ jobs:
250
250
brew link --overwrite "$pkg"
251
251
done
252
252
brew upgrade openssl >/dev/null 2>&1
253
- brew install ninja
254
253
brew upgrade
255
254
256
255
- name : Install deps on Linux
257
256
if : ${{ runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
258
257
run : |
259
258
# Install deps
260
259
sudo apt-get update
261
- sudo apt-get install ninja-build
262
260
sudo apt-get autoremove
263
261
sudo apt-get clean
264
262
@@ -300,13 +298,12 @@ jobs:
300
298
-DLLVM_INCLUDE_EXAMPLES=OFF \
301
299
-DLLVM_INCLUDE_TESTS=OFF \
302
300
-DLLVM_ENABLE_THREADS=OFF \
303
- -G Ninja \
304
301
../llvm
305
- emmake ninja clang cling lld gtest_main -j ${{ env.ncpus }}
302
+ emmake make clang cling lld gtest_main -j ${{ env.ncpus }}
306
303
else
307
304
# Apply patches
308
305
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
309
- if [[ "${llvm_vers}" == "19" ]]; then
306
+ if [[ "${llvm_vers}" == "19" ]]||[[ "${llvm_vers}" == "20" ]] ; then
310
307
git apply -v ../patches/llvm/emscripten-clang${{ matrix.clang-runtime }}-*.patch
311
308
echo "Apply emscripten-clang${{ matrix.clang-runtime }}-*.patch patches:"
312
309
fi
@@ -327,9 +324,8 @@ jobs:
327
324
-DLLVM_INCLUDE_EXAMPLES=OFF \
328
325
-DLLVM_INCLUDE_TESTS=OFF \
329
326
-DLLVM_ENABLE_THREADS=OFF \
330
- -G Ninja \
331
327
../llvm
332
- emmake ninja clang clangInterpreter clangStaticAnalyzerCore lld -j ${{ env.ncpus }}
328
+ emmake make clang clangInterpreter clangStaticAnalyzerCore lld -j ${{ env.ncpus }}
333
329
fi
334
330
cd ../
335
331
rm -rf $(find . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".")
0 commit comments