summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-05-08 17:51:31 +0800
committerkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-05-08 17:51:31 +0800
commit7e3f14387d9b81ca89e48b092ee48efcf265153d (patch)
tree2d10f15e9eb3a09f3d7d678f88756926d273ada1
parentb034c78df5c226ad79006ac9f82a7d550259d873 (diff)
downloadxorg-devel-ports-7e3f14387d9b81ca89e48b092ee48efcf265153d.tar.gz
xorg-devel-ports-7e3f14387d9b81ca89e48b092ee48efcf265153d.tar.zst
xorg-devel-ports-7e3f14387d9b81ca89e48b092ee48efcf265153d.zip
merge r867
Sync bsd.port.mk again git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7@868 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--Mk/bsd.port.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 1b50f78..3cb3559 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1,7 +1,7 @@
#-*- tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: head/Mk/bsd.port.mk 317452 2013-05-06 00:44:22Z hrs $
+# $FreeBSD: head/Mk/bsd.port.mk 317639 2013-05-08 00:12:08Z bdrewery $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -2168,7 +2168,6 @@ CFLAGS:= ${CFLAGS:N-std=*} -std=${USE_CSTD}
# Multiple make jobs support
.if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
-MAKE_JOBS_NUMBER= 1
_MAKE_JOBS= #
.else
.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS)
@@ -2180,6 +2179,10 @@ BUILD_FAIL_MESSAGE+= "You have chosen to use multiple make jobs (parallelization
.endif
.endif
+.if empty(MAKE_JOBS_NUMBER)
+MAKE_JOBS_NUMBER= 1
+.endif
+
# ccache support
# Support NO_CCACHE for common setups, require WITH_CCACHE_BUILD, and
# don't use if ccache already set in CC