Skip to content

Commit b769ca5

Browse files
authored
Use Ninja for emscripten build of llvm (#433)
1 parent d754a6c commit b769ca5

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

.github/workflows/emscripten.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,15 @@ jobs:
253253
brew link --overwrite "$pkg"
254254
done
255255
brew upgrade openssl >/dev/null 2>&1
256+
brew install ninja
256257
brew upgrade
257258
258259
- name: Install deps on Linux
259260
if: ${{ runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
260261
run: |
261262
# Install deps
262263
sudo apt-get update
264+
sudo apt-get install ninja-build
263265
sudo apt-get autoremove
264266
sudo apt-get clean
265267
@@ -301,11 +303,9 @@ jobs:
301303
-DLLVM_INCLUDE_EXAMPLES=OFF \
302304
-DLLVM_INCLUDE_TESTS=OFF \
303305
-DLLVM_ENABLE_THREADS=OFF \
306+
-G Ninja \
304307
../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 }}
309309
else
310310
# Apply patches
311311
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -330,10 +330,9 @@ jobs:
330330
-DLLVM_INCLUDE_EXAMPLES=OFF \
331331
-DLLVM_INCLUDE_TESTS=OFF \
332332
-DLLVM_ENABLE_THREADS=OFF \
333+
-G Ninja \
333334
../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 }}
337336
fi
338337
cd ../..
339338

0 commit comments

Comments
 (0)