From 987171e39d361d3376b8b5169698b7e57ab76d8b Mon Sep 17 00:00:00 2001
From: Ulya Trofimovich <skvadrik@gmail.com>
Date: Thu, 11 Jul 2019 11:34:59 +0100
Subject: [PATCH] Build scripts: changed -j5 to -j$(nproc).

---
 __build.sh                   | 2 +-
 __build_asan.sh              | 2 +-
 __build_clang.sh             | 2 +-
 __build_clang_msan.sh        | 8 ++++----
 __build_glibcxx_debug.sh     | 2 +-
 __build_lsan.sh              | 2 +-
 __build_m32.sh               | 2 +-
 __build_mingw.sh             | 2 +-
 __build_nodebug.sh           | 2 +-
 __build_redundant_exports.sh | 2 +-
 __build_ubsan.sh             | 2 +-
 __distcheck.sh               | 4 ++--
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/__build.sh b/__build.sh
index ae02cc05..920f1b6d 100755
--- 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 974c1cd2..14b8468e 100755
--- 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 56d2629e..8aa46f4f 100755
--- 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 29c4af54..bfdc713f 100755
--- 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 ebb435a0..0417053a 100755
--- 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 7a55660d..abac13c7 100755
--- 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 eeb47ed0..081ec7a5 100755
--- 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 13c3c8ae..51daba5c 100755
--- 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 627b817a..ed0662c6 100755
--- 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 4f04c5a0..6c6f66bb 100755
--- 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 543ba001..6f8e2177 100755
--- 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 dd1e8529..db486208 100755
--- 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
-- 
2.50.1