diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2015-04-10 05:45:15 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2015-04-10 05:45:15 +0000 |
| commit | 35da4891c29a51d7e304f937c6bece19ec4b6693 (patch) | |
| tree | b867a314a066544323913472a439defe757d1b09 | |
| parent | Revert an upstream commit to fix a serious disassembler regression. (diff) | |
- Make it possible to override _MAKE_JOBS when MAKE_JOBS_NUMBER=1
- Override it for USES=ninja
With this commit and r383571, ports using ninja and waf now respect
MAKE_JOBS_NUMBER when it's equal to 1
PR: 197910
With hat: portmgr
| -rw-r--r-- | Mk/Uses/ninja.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Mk/Uses/ninja.mk b/Mk/Uses/ninja.mk index 3e7c6186e033..42859684f78f 100644 --- a/Mk/Uses/ninja.mk +++ b/Mk/Uses/ninja.mk @@ -27,6 +27,8 @@ CMAKE_ARGS+= -GNinja MAKEFILE= MAKE_CMD= ninja MAKE_FLAGS= +# Set a minimal job of 1 +_MAKE_JOBS= -j${MAKE_JOBS_NUMBER} _DESTDIR_VIA_ENV= yes .endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index b1e171b86e47..3c6df233edc3 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2039,7 +2039,7 @@ ${lang}FLAGS+= ${${lang}FLAGS_${ARCH}} # Multiple make jobs support .if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE) -_MAKE_JOBS= # +_MAKE_JOBS?= # MAKE_JOBS_NUMBER= 1 .else .if defined(MAKE_JOBS_NUMBER) |