Build scripts: changed -j5 to -j$(nproc).

diff --git a/__build.sh b/__build.sh
index ae02cc05e8c43a8ca7758ac57a74ea5b5c9c7a2d..920f1b6d98d5520557c1f9476a8d41bef5eca3ee 100755 (executable)
--- a/__build.sh
+++ b/__build.sh
@@ -8,5 +8,5 @@ cd $builddir
 ../configure \
     --enable-debug \
     --enable-libs \
-    && make -j5
+    && make -j$(nproc)
 cd ..

diff --git a/__build_asan.sh b/__build_asan.sh
index 974c1cd208696f5fee2c7cbd3b102c70d7b4b774..14b8468e84907c4996b6be013f10985ef74108fa 100755 (executable)
--- a/__build_asan.sh
+++ b/__build_asan.sh
@@ -10,5 +10,5 @@ cd $builddir
     --enable-libs \
     CXXFLAGS="-fsanitize=address" \
     LDFLAGS="-fsanitize=address" \
-    && make -j5
+    && make -j$(nproc)
 cd ..

diff --git a/__build_clang.sh b/__build_clang.sh
index 56d2629e932e3964121848d1acd360daf41a75bc..8aa46f4f34f99f16367b8c1a3db58badae70f1c0 100755 (executable)
--- a/__build_clang.sh
+++ b/__build_clang.sh
@@ -10,5 +10,5 @@ cd $builddir
     --enable-libs \
     CC=clang \
     CXX=clang++ \
-    && make -j5
+    && make -j$(nproc)
 cd ..

diff --git a/__build_clang_msan.sh b/__build_clang_msan.sh
index 29c4af548b6a8093efda8edcabda1c5e4b97d97b..bfdc713f793a72b5c0a9b58cb403f99c419475b6 100755 (executable)
--- a/__build_clang_msan.sh
+++ b/__build_clang_msan.sh
@@ -10,8 +10,8 @@ cd $builddir
     --enable-libs \
     CC=clang \
     CXX=clang++ \
-    CFLAGS="-fsanitize=memory" \
-    CXXFLAGS="-fsanitize=memory" \
-    LDFLAGS="-fsanitize=memory" \
-    && make -j5
+    CFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2" \
+    CXXFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2" \
+    LDFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2" \
+    && make -j$(nproc)
 cd ..

diff --git a/__build_glibcxx_debug.sh b/__build_glibcxx_debug.sh
index ebb435a01d6948f4845750b2972ed8ce1b3a181a..0417053a3bffe888482923d183d6e071a9ac2384 100755 (executable)
--- a/__build_glibcxx_debug.sh
+++ b/__build_glibcxx_debug.sh
@@ -9,5 +9,5 @@ cd $builddir
     --enable-debug \
     --enable-libs \
     CXXFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC" \
-    && make -j5
+    && make -j$(nproc)
 cd ..

diff --git a/__build_lsan.sh b/__build_lsan.sh
index 7a55660d0eac31b6b52c4a3a4c44fc972f6c4d30..abac13c774dc5ef027477197de4e27fc397a0794 100755 (executable)
--- a/__build_lsan.sh
+++ b/__build_lsan.sh
@@ -10,5 +10,5 @@ cd $builddir
     --enable-libs \
     CXXFLAGS="-fsanitize=leak" \
     LDFLAGS="-fsanitize=leak" \
-    && make -j5
+    && make -j$(nproc)
 cd ..

diff --git a/__build_m32.sh b/__build_m32.sh
index eeb47ed0265b7acf81c40d9343aeaacd32a5d6b0..081ec7a5809d150c494dafb7a0ab2946b8afcd8e 100755 (executable)
--- a/__build_m32.sh
+++ b/__build_m32.sh
@@ -10,5 +10,5 @@ cd $builddir
     --enable-libs \
     CXXFLAGS="-m32" \
     LDFLAGS="-m32" \
-    && make -j5
+    && make -j$(nproc)
 cd ..

diff --git a/__build_mingw.sh b/__build_mingw.sh
index 13c3c8ae9512fc8c0bf439da904f62c59f3cfdc1..51daba5cd2da70803e526108cd78ffa6dd97f710 100755 (executable)
--- a/__build_mingw.sh
+++ b/__build_mingw.sh
@@ -9,5 +9,5 @@ cd $builddir
     --enable-debug \
     --enable-libs \
     --host i686-w64-mingw32 \
-    && make -j5 LIBTOOL="dlibtool"
+    && make -j$(nproc) LIBTOOL="dlibtool"
 cd ..

diff --git a/__build_nodebug.sh b/__build_nodebug.sh
index 627b817afa7e369789cf76be43287dc18719c405..ed0662c62194920c480985d3b61fcf36f871a4cb 100755 (executable)
--- a/__build_nodebug.sh
+++ b/__build_nodebug.sh
@@ -7,5 +7,5 @@ mkdir $builddir
 cd $builddir
 ../configure \
     --enable-libs \
-    && make -j5
+    && make -j$(nproc)
 cd ..

diff --git a/__build_redundant_exports.sh b/__build_redundant_exports.sh
index 4f04c5a063efb4f90704847302c414777ae45976..6c6f66bbc9b89abb722e02cb3591a44dfd9ebea1 100755 (executable)
--- a/__build_redundant_exports.sh
+++ b/__build_redundant_exports.sh
@@ -10,5 +10,5 @@ cd $builddir
     --enable-libs \
     CFLAGS="-ffunction-sections -fdata-sections" \
     LDFLAGS="-Wl,--gc-sections -Wl,--print-gc-sections" \
-    && make -j5
+    && make -j$(nproc)
 cd ..

diff --git a/__build_ubsan.sh b/__build_ubsan.sh
index 543ba00113861283a96736fa78619a1ce7595793..6f8e21774414261c879bc3784ef30c0c85943d95 100755 (executable)
--- a/__build_ubsan.sh
+++ b/__build_ubsan.sh
@@ -10,5 +10,5 @@ cd $builddir
     --enable-libs \
     CXXFLAGS="-fsanitize=undefined" \
     LDFLAGS="-fsanitize=undefined" \
-    && make -j5
+    && make -j$(nproc)
 cd ..

diff --git a/__distcheck.sh b/__distcheck.sh
index dd1e8529c4a51b922368a1010164961b0396f5bc..db486208e0ace69146dd6cfce848574fe0200c20 100755 (executable)
--- a/__distcheck.sh
+++ b/__distcheck.sh
@@ -20,7 +20,7 @@ do
         # 'make' implies 'make docs'; running both in parallel may cause data races
         # configure without --enable-debug, this is the release binary
         ../configure --enable-docs --enable-libs \
-        && $make_prog bootstrap -j5 \
-        && $make_prog distcheck -j5
+        && $make_prog bootstrap -j$(nproc) \
+        && $make_prog distcheck -j$(nproc)
     cd ..
 done