summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2013-09-11 18:16:18 +0000
committersjg <sjg@FreeBSD.org>2013-09-11 18:16:18 +0000
commitff87b5d1477fd150ff715e5c3c2a205deb66804f (patch)
treea3620d99f472deaa7f019c4324bb8f4e38ac4272 /Makefile
parent62bb1062226d3ce6a2350808256a25508978352d (diff)
parent4d92de31b23f33109e1fa7f0b1499ed6c3501ee1 (diff)
downloadFreeBSD-src-ff87b5d1477fd150ff715e5c3c2a205deb66804f.zip
FreeBSD-src-ff87b5d1477fd150ff715e5c3c2a205deb66804f.tar.gz
Merge head
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 2ffbd43..f9339e6 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
OpenPOWER on IntegriCloud