diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-12-04 03:44:50 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-12-04 03:44:50 +0000 |
| commit | 3701dbc8590c930d6e4b09de745aaa4dcfba7e70 (patch) | |
| tree | 49c5e54e08a0713d172f9121751e1fef71490c8b /usr.sbin/mergemaster | |
| parent | 4160ed6f8bfbefd9c0e970a51c4ea92dca96cb64 (diff) | |
| download | src-3701dbc8590c930d6e4b09de745aaa4dcfba7e70.tar.gz src-3701dbc8590c930d6e4b09de745aaa4dcfba7e70.zip | |
Run make in parallel.
This is mostly targetting the 'installconfig' phase of 'distribution'
which does a full tree walk.
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=355379
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 486a957be842..2b9fcadcb151 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -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. |