X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build-pspp;h=d7ea908479564fa8c1b73b7dd0aae139df2c06bd;hb=d4ccb00f0ca0f4b248b51ccf04239f8d4640ef1b;hp=62e8a75030545f7c348c0a528c167fc10d808392;hpb=4138eb6b6199bcb31345250dd0292f8559f14558;p=pspp

diff --git a/build-pspp b/build-pspp
index 62e8a75030..d7ea908479 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"
@@ -522,8 +522,8 @@ if build_binary:
                 % (builddir, tarball_dir, binary_version), 1)
 
     start_step("Check")
-    ok = try_run("cd %s/%s/_build && make check" % (builddir, tarball_dir),
-                 "check")
+    ok = try_run("cd %s/%s/_build && make check TESTSUITEFLAGS=-j$(nproc)"
+                 % (builddir, tarball_dir), "check")
     for basename in ("tests/testsuite.log", "tests/testsuite.dir"):
         save_result_if_exists("test logs", "%s/%s/_build/%s"
                               % (builddir, tarball_dir, basename))
@@ -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")