From 07a17ebe0d74d31c82f2311dd5348c189d1d3790 Mon Sep 17 00:00:00 2001
From: Eric Berquist <ejberqu@sandia.gov>
Date: Thu, 29 Aug 2024 08:38:32 -0600
Subject: [PATCH] remove explicit parallelism in make calls

---
 buildsys/bamboo.sh                               | 16 ++++++++--------
 buildsys/deps/bin/sstDep_dramsim3_stabledevel.sh |  2 +-
 test/testSuites/testSuite_macro.sh               |  6 ++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/buildsys/bamboo.sh b/buildsys/bamboo.sh
index ca780122..d7b6c62e 100755
--- a/buildsys/bamboo.sh
+++ b/buildsys/bamboo.sh
@@ -1278,8 +1278,8 @@ config_and_build() {
         echo ' '
         echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 
-        echo "=== Running make -j4 all ==="
-        make -j4 all
+        echo "=== Running make all ==="
+        make all
         retval=$?
         if [ $retval -ne 0 ]
         then
@@ -1299,8 +1299,8 @@ config_and_build() {
         echo ' '
         echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 
-        echo "=== Running make -j4 install ==="
-        make -j4 install
+        echo "=== Running make install ==="
+        make install
         retval=$?
         if [ $retval -ne 0 ]
         then
@@ -1385,8 +1385,8 @@ config_and_build_simple() {
         echo ' '
         echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 
-        echo "=== Running make -j4 ==="
-        make -j4
+        echo "=== Running make ==="
+        make
         retval=$?
         if [ $retval -ne 0 ]
         then
@@ -1406,8 +1406,8 @@ config_and_build_simple() {
         echo ' '
         echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 
-        echo "=== Running make -j4 install ==="
-        make -j4 install
+        echo "=== Running make install ==="
+        make install
         retval=$?;
         if [ $retval -ne 0 ]
         then
diff --git a/buildsys/deps/bin/sstDep_dramsim3_stabledevel.sh b/buildsys/deps/bin/sstDep_dramsim3_stabledevel.sh
index 9152a524..6cb33347 100644
--- a/buildsys/deps/bin/sstDep_dramsim3_stabledevel.sh
+++ b/buildsys/deps/bin/sstDep_dramsim3_stabledevel.sh
@@ -129,7 +129,7 @@ sstDepsDeploy_dramsim3 ()
         return $retval
     fi
 
-    make -j4
+    make
 
     retval=$?
     if [ $retval -ne 0 ]
diff --git a/test/testSuites/testSuite_macro.sh b/test/testSuites/testSuite_macro.sh
index d3d0b10f..001752f0 100755
--- a/test/testSuites/testSuite_macro.sh
+++ b/test/testSuites/testSuite_macro.sh
@@ -86,8 +86,7 @@ test_macro_make_check() {
     then
         # Run SUT
 #        (make ${sutArgs} > $outFile)
-        # TODO parameterize number of build threads
-        (make -j4 ${sutArgs})
+        (make ${sutArgs})
         RetVal=$?
         local TIME_FLAG=$SSTTESTTEMPFILES/TimeFlag_$$_${__timerChild}
         if [ -e $TIME_FLAG ] ; then
@@ -149,8 +148,7 @@ test_macro_make_installcheck() {
     then
         # Run SUT
 #        (make ${sutArgs} > $outFile)
-        # TODO parameterize number of build threads
-        (make -j4 ${sutArgs})
+        (make ${sutArgs})
         RetVal=$?
         local TIME_FLAG=$SSTTESTTEMPFILES/TimeFlag_$$_${__timerChild}
         if [ -e $TIME_FLAG ] ; then