diff options
author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-07 18:45:55 +0000 |
---|---|---|
committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-07 18:45:55 +0000 |
commit | 1c2a618bbf6e0ac9783e2600864fa0f5e362ecda (patch) | |
tree | 089f603cc6c0b339f5767f6c6cf01edd1234e0e9 | |
parent | 4c22b4686b926ce3835e471c72ff44c1a677e924 (diff) | |
download | src-1c2a618bbf6e0ac9783e2600864fa0f5e362ecda.tar.gz src-1c2a618bbf6e0ac9783e2600864fa0f5e362ecda.zip |
Notes
-rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 9d2253c04b87..03a3fd839fd0 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -666,7 +666,7 @@ everything: @echo "--------------------------------------------------------------" @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; _PARALLEL_SUBUDIR_OK=1 ${WMAKE} all + ${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all .if defined(LIB32TMP) build32: .PHONY @echo @@ -2008,14 +2008,14 @@ _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} # Enable SUBDIR_PARALLEL when not calling 'make all', unless called from -# 'everything' with _PARALLEL_SUBUDIR_OK set. This is because it is unlikely +# 'everything' with _PARALLEL_SUBDIR_OK set. This is because it is unlikely # that running 'make all' from the top-level, especially with a SUBDIR_OVERRIDE # or LOCAL_DIRS set, will have a reliable build if SUBDIRs are built in # parallel. This is safe for the world stage of buildworld though since it has # already built libraries in a proper order and installed includes into # WORLDTMP. Special handling is done for SUBDIR ordering for 'install*' to # avoid trashing a system if it crashes mid-install. -.if !make(all) || defined(_PARALLEL_SUBUDIR_OK) +.if !make(all) || defined(_PARALLEL_SUBDIR_OK) SUBDIR_PARALLEL= .endif |