Run no more than 16 jobs in parallel.

BrowserWorks · May 19, 2021 · 506d4e2 · 506d4e2
1 parent 6e93d0a
commit 506d4e2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/.mozconfig-production b/.mozconfig-production
@@ -36,11 +36,7 @@ elif test $(uname -s) = Linux; then
 fi
 
 if test $(uname -s) = MINGW32_NT-6.2; then
-	X=$(wmic cpu get NumberOfLogicalProcessors /Format:List | cut -d'=' -f2 | xargs)
-	mk_add_options MOZ_MAKE_FLAGS=-j${X}
-else
-	X=$(($(getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN) * 3 / 2))
-	mk_add_options MOZ_MAKE_FLAGS=-j${X%.*}
+	mk_add_options MOZ_MAKE_FLAGS=-j16
 fi
 
 ac_add_options --disable-debug
@@ -61,7 +57,7 @@ ac_add_options --enable-rust-simd
 ac_add_options --enable-updater
 
 ac_add_options --with-branding=browser/branding/waterfox
-ac_add_options --with-l10n-base=$PWD/browser/locales/l10n
+ac_add_options --with-l10n-base=$BUILD_DIR/browser/locales/l10n
 
 if test -f "$HOME/.mozbuild/sccache/sccache"; then
 	ac_add_options --with-ccache=$HOME/.mozbuild/sccache/sccache

diff --git a/.mozconfig-x86_64-apple-darwin b/.mozconfig-x86_64-apple-darwin
@@ -40,7 +40,7 @@ ac_add_options --with-macos-sdk=$CROSS_SYSROOT
 X=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
 
 mk_add_options AUTOCLOBBER=1
-mk_add_options MOZ_MAKE_FLAGS=-j${X}
+mk_add_options MOZ_MAKE_FLAGS=-j16
 
 ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
 ac_add_options --disable-debug

diff --git a/.mozconfig-x86_64-pc-windows-msvc b/.mozconfig-x86_64-pc-windows-msvc
@@ -23,7 +23,7 @@ export WIN_UCRT_REDIST_DIR="${WINDOWSSDKDIR}/Redist/ucrt/DLLs/x64"
 mk_add_options "export LD_PRELOAD=/tooltool11/liblowercase/liblowercase.so"
 mk_add_options "export LOWERCASE_DIRS=/mnt"
 mk_add_options "export PATH=${TOOLTOOL_DIR}/wine/bin:{TOOLTOOL_DIR}/fxc2/bin:/mnt/LLVM/bin:/home/akontos/tooltool11/mingw-w64-clang/bin:$EXTRA_PATH$PATH"
-mk_add_options MOZ_MAKE_FLAGS=-j${X%.*}
+mk_add_options MOZ_MAKE_FLAGS=-j16
 
 ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
 ac_add_options --disable-bits-download

diff --git a/.mozconfig-x86_64-unknown-linux-gnu b/.mozconfig-x86_64-unknown-linux-gnu
@@ -20,7 +20,7 @@ ac_add_options --enable-pulseaudio
 ac_add_options --enable-alsa
 
 X=$(($(getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN) * 3 / 2))
-mk_add_options MOZ_MAKE_FLAGS=-j${X%.*}
+mk_add_options MOZ_MAKE_FLAGS=-j16
 
 ac_add_options --disable-debug
 ac_add_options --disable-dmd

diff --git a/.mozconfig-x86_64-w64-mingw32 b/.mozconfig-x86_64-w64-mingw32
@@ -57,4 +57,4 @@ export MOZ_REQUIRE_SIGNING=0
 mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 mk_add_options "export PATH=${TOOLTOOL_DIR}/mingw-w64-clang/bin:${TOOLTOOL_DIR}/wine/bin:${TOOLTOOL_DIR}/upx/bin:${TOOLTOOL_DIR}/fxc2/bin:$PATH"
 mk_add_options AUTOCLOBBER=1
-mk_add_options MOZ_MAKE_FLAGS=-j${X}
+mk_add_options MOZ_MAKE_FLAGS=-j16