svn commit: r355379 - head/usr.sbin/mergemaster

[Bryan Drewery]

Author: bdrewery
Date: Wed Dec  4 03:44:50 2019
New Revision: 355379
URL: https://svnweb.freebsd.org/changeset/base/355379

Log:
  Run make in parallel.
  
  This is mostly targetting the 'installconfig' phase of 'distribution'
  which does a full tree walk.
  
  MFC after:	 2 weeks

Modified:
  head/usr.sbin/mergemaster/mergemaster.sh

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Wed Dec  4 03:41:55 2019	(r355378)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Wed Dec  4 03:44:50 2019	(r355379)
@@ -508,6 +508,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$(sysctl -n hw.ncpu)"
 
 # Check DESTDIR against the mergemaster mtree database to see what
 # files the user changed from the reference files.