svn commit: r356698 - stable/11/usr.sbin/mergemaster

[Bryan Drewery]

Author: bdrewery
Date: Mon Jan 13 19:33:26 2020
New Revision: 356698
URL: https://svnweb.freebsd.org/changeset/base/356698

Log:
  MFC r355379,r355381:
  
    r355379:
      Run make in parallel.
    r355381:
      Use full path to sysctl(8) since /sbin is not in PATH.

Modified:
  stable/11/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/11/usr.sbin/mergemaster/mergemaster.sh	Mon Jan 13 19:30:18 2020	(r356697)
+++ stable/11/usr.sbin/mergemaster/mergemaster.sh	Mon Jan 13 19:33:26 2020	(r356698)
@@ -487,6 +487,7 @@ SOURCEDIR=$(realpath "$SOURCEDIR")
 
 # Setup make to use system files from SOURCEDIR
 MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk -DNO_FILEMON"
+MM_MAKE="${MM_MAKE} -j$(/sbin/sysctl -n hw.ncpu)"
 
 # Check DESTDIR against the mergemaster mtree database to see what
 # files the user changed from the reference files.