From: Joel Rosdahl Date: Sun, 17 Mar 2024 14:55:19 +0000 (+0100) Subject: chore: Fix build parallelism in ci/build again X-Git-Tag: v4.10~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a541ee0f12fd3609dc662ef4c25b279078466fb6;p=thirdparty%2Fccache.git chore: Fix build parallelism in ci/build again The -j option was removed in 39dcc7488159e6812292ecbd15a1ed25ade493a2, but that means that builds using make will be serial. Thus add the option again. --- diff --git a/ci/build b/ci/build index 9001bfbda..4ed04ebb9 100755 --- a/ci/build +++ b/ci/build @@ -26,12 +26,12 @@ else cd "${BUILDDIR}" ${CMAKE_PREFIX} cmake ${CMAKE_PARAMS} ${CCACHE_LOC} - case "${CMAKE_GENERATOR}" in + case "${CMAKE_GENERATOR:-}" in [Vv]isual" "[Ss]tudio*) # MSBuild, use all CPUs. ${CMAKE_PREFIX} cmake --build . ${EXTRA_CMAKE_BUILD_FLAGS} -- -m ;; - *) # Ninja automatically uses all available CPUs. - ${CMAKE_PREFIX} cmake --build . ${EXTRA_CMAKE_BUILD_FLAGS} + *) + ${CMAKE_PREFIX} cmake --build . ${EXTRA_CMAKE_BUILD_FLAGS} -- -j "${JOBS}" ;; esac