From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 5 Sep 2020 18:10:28 +0000 (-0700)
Subject: build-pspp: Use $(nproc) instead of fixed 10 processes.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a205087d29a7c89fd85858e8feb80816a54dd1e;p=pspp

build-pspp: Use $(nproc) instead of fixed 10 processes.
---

diff --git a/build-pspp b/build-pspp
index 62e8a75030..889509c930 100755
--- a/build-pspp
+++ b/build-pspp
@@ -284,10 +284,10 @@ if len(args) == 2:
     run("cd %s && ./configure --prefix=''" % ssw_dir)
 
     start_step("Build spread-sheet-widget")
-    run("cd %s && make -j10" % ssw_dir)
+    run("cd %s && make -j$(nproc)" % ssw_dir)
 
     start_step("Install spread-sheet-widget")
-    run("cd %s && make -j10 install DESTDIR=$PWD/inst" % ssw_dir)
+    run("cd %s && make -j$(nproc) install DESTDIR=$PWD/inst" % ssw_dir)
 
     start_step("Fetch branch from Git")
     set_var("git_repo", repo)
@@ -410,7 +410,7 @@ Changes from %(repo_version)s to %(version)s:
 
     # Bootstrap.
     start_step("Bootstrap (make -f Smake)")
-    run("cd pspp && make -f Smake -j10", "bootstrap")
+    run("cd pspp && make -f Smake -j$(nproc)", "bootstrap")
 
     # Configure.
     start_step("Configure source")
@@ -499,14 +499,14 @@ if build_binary:
         fail()
 
     start_step("Build")
-    run("cd %s/%s/_build && make -j10" % (builddir, tarball_dir), "build")
-    run("cd %s/%s/_build/perl-module && perl Makefile.PL && make -j10"
+    run("cd %s/%s/_build && make -j$(nproc)" % (builddir, tarball_dir), "build")
+    run("cd %s/%s/_build/perl-module && perl Makefile.PL && make -j$(nproc)"
         % (builddir, tarball_dir), "build Perl module")
 
     start_step("Install")
     run("cd %s/%s/_build && make install DESTDIR=$PWD/pspp-%s"
         % (builddir, tarball_dir, binary_version), "install")
-    run("cd ../source/%s && make -j10 install DESTDIR=%s/%s/_build/pspp-%s"
+    run("cd ../source/%s && make -j$(nproc) install DESTDIR=%s/%s/_build/pspp-%s"
         % (ssw_dir, builddir, tarball_dir, binary_version))
     run("cd %s/%s/_build/perl-module && "
         "make install DESTDIR=%s/%s/_build/pspp-%s"
@@ -531,7 +531,7 @@ if build_binary:
         fail()
 
     start_step("Uninstall")
-    run("cd ../source/%s && make -j10 uninstall DESTDIR=%s/%s/_build/pspp-%s"
+    run("cd ../source/%s && make -j$(nproc) uninstall DESTDIR=%s/%s/_build/pspp-%s"
         % (ssw_dir, builddir, tarball_dir, binary_version))
     run("cd %s/%s/_build && make uninstall DESTDIR=$PWD/pspp-%s"
         % (builddir, tarball_dir, binary_version), "uninstall")