aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2013-09-11 18:16:18 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2013-09-11 18:16:18 +0000
commitd466a5b069a40c37cec11dfd03fd46b30c4c9587 (patch)
treea3620d99f472deaa7f019c4324bb8f4e38ac4272 /Makefile
parentd1d015864103b253b3fcb2f72a0da5b0cfeb31b6 (diff)
parent64c5de5483d0895b673ba6506d204762b8b11a60 (diff)
downloadsrc-d466a5b069a40c37cec11dfd03fd46b30c4c9587.tar.gz
src-d466a5b069a40c37cec11dfd03fd46b30c4c9587.zip
Merge head
Notes
Notes: svn path=/projects/bmake/; revision=255477
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 2ffbd43cdc41..f9339e64c4ec 100644
--- a/Makefile
+++ b/Makefile
@@ -505,4 +505,10 @@ buildLINT:
# make sure things we run from here don't either
WITHOUT_META_MODE=
.export WITHOUT_META_MODE
+
+.if make(universe)
+# we do not want a failure of one branch abort all.
+MAKE_JOB_ERROR_TOKEN= no
+.export MAKE_JOB_ERROR_TOKEN
+.endif
.endif