@@ -253,13 +253,15 @@ jobs:
253
253
brew link --overwrite "$pkg"
254
254
done
255
255
brew upgrade openssl >/dev/null 2>&1
256
+ brew install ninja
256
257
brew upgrade
257
258
258
259
- name : Install deps on Linux
259
260
if : ${{ runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
260
261
run : |
261
262
# Install deps
262
263
sudo apt-get update
264
+ sudo apt-get install ninja-build
263
265
sudo apt-get autoremove
264
266
sudo apt-get clean
265
267
@@ -301,11 +303,9 @@ jobs:
301
303
-DLLVM_INCLUDE_EXAMPLES=OFF \
302
304
-DLLVM_INCLUDE_TESTS=OFF \
303
305
-DLLVM_ENABLE_THREADS=OFF \
306
+ -G Ninja \
304
307
../llvm
305
- emmake make clang -j ${{ env.ncpus }}
306
- emmake make cling -j ${{ env.ncpus }}
307
- # Now build gtest.a and gtest_main for CppInterOp to run its tests.
308
- emmake make gtest_main -j ${{ env.ncpus }}
308
+ emmake ninja clang cling lld gtest_main -j ${{ env.ncpus }}
309
309
else
310
310
# Apply patches
311
311
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -330,10 +330,9 @@ jobs:
330
330
-DLLVM_INCLUDE_EXAMPLES=OFF \
331
331
-DLLVM_INCLUDE_TESTS=OFF \
332
332
-DLLVM_ENABLE_THREADS=OFF \
333
+ -G Ninja \
333
334
../llvm
334
- emmake make clang -j ${{ env.ncpus }}
335
- emmake make clang-repl -j ${{ env.ncpus }}
336
- emmake make lld -j ${{ env.ncpus }}
335
+ emmake ninja clang clang-repl lld -j ${{ env.ncpus }}
337
336
fi
338
337
cd ../..
339
338
0 commit comments