Skip to content

Commit eac22b5

Browse files
authored
Revert back to make Emscripten builds
1 parent 81c0660 commit eac22b5

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

.github/workflows/emscripten.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -250,15 +250,13 @@ jobs:
250250
brew link --overwrite "$pkg"
251251
done
252252
brew upgrade openssl >/dev/null 2>&1
253-
brew install ninja
254253
brew upgrade
255254
256255
- name: Install deps on Linux
257256
if: ${{ runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
258257
run: |
259258
# Install deps
260259
sudo apt-get update
261-
sudo apt-get install ninja-build
262260
sudo apt-get autoremove
263261
sudo apt-get clean
264262
@@ -300,9 +298,8 @@ jobs:
300298
-DLLVM_INCLUDE_EXAMPLES=OFF \
301299
-DLLVM_INCLUDE_TESTS=OFF \
302300
-DLLVM_ENABLE_THREADS=OFF \
303-
-G Ninja \
304301
../llvm
305-
emmake ninja clang cling lld gtest_main -j ${{ env.ncpus }}
302+
emmake make clang cling lld gtest_main -j ${{ env.ncpus }}
306303
else
307304
# Apply patches
308305
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -327,9 +324,8 @@ jobs:
327324
-DLLVM_INCLUDE_EXAMPLES=OFF \
328325
-DLLVM_INCLUDE_TESTS=OFF \
329326
-DLLVM_ENABLE_THREADS=OFF \
330-
-G Ninja \
331327
../llvm
332-
emmake ninja clang clangInterpreter clangStaticAnalyzerCore lld -j ${{ env.ncpus }}
328+
emmake make clang clangInterpreter clangStaticAnalyzerCore lld -j ${{ env.ncpus }}
333329
fi
334330
cd ../
335331
rm -rf $(find . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".")

0 commit comments

Comments
 (0)