File tree Expand file tree Collapse file tree 2 files changed +14
-11
lines changed Expand file tree Collapse file tree 2 files changed +14
-11
lines changed Original file line number Diff line number Diff line change @@ -206,6 +206,7 @@ jobs:
206
206
done
207
207
brew upgrade openssl >/dev/null 2>&1
208
208
brew upgrade
209
+ brew install ninja
209
210
210
211
- name : Build LLVM/Cling if the cache is invalid
211
212
if : ${{ steps.cache.outputs.cache-hit != 'true' }}
@@ -238,11 +239,12 @@ jobs:
238
239
-DLLVM_ENABLE_ZSTD=OFF \
239
240
-DLLVM_ENABLE_TERMINFO=OFF \
240
241
-DLLVM_ENABLE_LIBXML2=OFF \
242
+ -G Ninja \
241
243
../llvm
242
- cmake --build . --target clang --parallel ${{ env.ncpus }}
243
- cmake --build . --target cling --parallel ${{ env.ncpus }}
244
+ ninja clang -j ${{ env.ncpus }}
245
+ ninja cling -j ${{ env.ncpus }}
244
246
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
245
- cmake --build . --target gtest_main --parallel ${{ env.ncpus }}
247
+ ninja gtest_main -j ${{ env.ncpus }}
246
248
else
247
249
# Apply patches
248
250
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -262,9 +264,9 @@ jobs:
262
264
-DLLVM_ENABLE_ZSTD=OFF \
263
265
-DLLVM_ENABLE_TERMINFO=OFF \
264
266
-DLLVM_ENABLE_LIBXML2=OFF \
267
+ -G Ninja \
265
268
../llvm
266
- cmake --build . --target clang clang-repl --parallel ${{ env.ncpus }}
267
-
269
+ ninja clang clang-repl -j ${{ env.ncpus }}
268
270
fi
269
271
cd ../
270
272
rm -rf $(find . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".")
Original file line number Diff line number Diff line change @@ -140,7 +140,7 @@ jobs:
140
140
run : |
141
141
# Install deps
142
142
sudo apt-get update
143
- sudo apt-get install valgrind
143
+ sudo apt-get install valgrind ninja-build
144
144
sudo apt-get autoremove
145
145
sudo apt-get clean
146
146
@@ -175,11 +175,12 @@ jobs:
175
175
-DLLVM_ENABLE_ZSTD=OFF \
176
176
-DLLVM_ENABLE_TERMINFO=OFF \
177
177
-DLLVM_ENABLE_LIBXML2=OFF \
178
+ -G Ninja \
178
179
../llvm
179
- cmake --build . --target clang --parallel ${{ env.ncpus }}
180
- cmake --build . --target cling --parallel ${{ env.ncpus }}
180
+ ninja clang -j ${{ env.ncpus }}
181
+ ninja cling -j ${{ env.ncpus }}
181
182
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
182
- cmake --build . --target gtest_main --parallel ${{ env.ncpus }}
183
+ ninja gtest_main -j ${{ env.ncpus }}
183
184
else
184
185
# Apply patches
185
186
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -199,9 +200,9 @@ jobs:
199
200
-DLLVM_ENABLE_ZSTD=OFF \
200
201
-DLLVM_ENABLE_TERMINFO=OFF \
201
202
-DLLVM_ENABLE_LIBXML2=OFF \
203
+ -G Ninja \
202
204
../llvm
203
- cmake --build . --target clang clang-repl --parallel ${{ env.ncpus }}
204
-
205
+ ninja clang clang-repl -j ${{ env.ncpus }}
205
206
fi
206
207
cd ../
207
208
rm -rf $(find . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".")
You can’t perform that action at this time.
0 commit comments