diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-09-19 09:36:44 +0000 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-09-19 16:13:27 +0000 |
| commit | fa3b5e5e57cd4649d577e06a3aca798b55a75fd5 (patch) | |
| tree | 9c691fd32606ae4abe05e9dbfaeb4b3d1b6e1f8d /ci | |
| parent | 737aac8cc8e76f18e49e7ed1291940d4a64dd495 (diff) | |
ci: Use nproc over MAKEJOBS in 01_base_install
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test/01_base_install.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh index b05d7547c8..424dca52dc 100755 --- a/ci/test/01_base_install.sh +++ b/ci/test/01_base_install.sh @@ -51,7 +51,7 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then -DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi;libunwind" \ -S /msan/llvm-project/llvm - ninja -C /msan/clang_build/ "$MAKEJOBS" + ninja -C /msan/clang_build/ "-j$( nproc )" # Use nproc, because MAKEJOBS is the default in docker image builds ninja -C /msan/clang_build/ install-runtimes update-alternatives --install /usr/bin/clang++ clang++ /msan/clang_build/bin/clang++ 100 @@ -69,13 +69,13 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then -DLIBCXX_HARDENING_MODE=debug \ -S /msan/llvm-project/runtimes - ninja -C /msan/cxx_build/ "$MAKEJOBS" + ninja -C /msan/cxx_build/ "-j$( nproc )" # Use nproc, because MAKEJOBS is the default in docker image builds fi if [[ "${RUN_TIDY}" == "true" ]]; then git clone --depth=1 https://github.com/include-what-you-use/include-what-you-use -b clang_16 /include-what-you-use cmake -B /iwyu-build/ -G 'Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-16 -S /include-what-you-use - make -C /iwyu-build/ install "$MAKEJOBS" + make -C /iwyu-build/ install "-j$( nproc )" # Use nproc, because MAKEJOBS is the default in docker image builds fi mkdir -p "${DEPENDS_DIR}/SDKs" "${DEPENDS_DIR}/sdk-sources" |