summaryrefslogtreecommitdiffstats
path: root/contrib/bmake/README
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2014-12-27 16:43:22 +0000
committerngie <ngie@FreeBSD.org>2014-12-27 16:43:22 +0000
commit8add61763b21b8a771358ffb7487539302c74b89 (patch)
tree6e0c6cbe41773548a3cf1cc3e78f0f9603cfc512 /contrib/bmake/README
parent47ae0568410e2e98be8543ec7afddbbabda95453 (diff)
downloadFreeBSD-src-8add61763b21b8a771358ffb7487539302c74b89.zip
FreeBSD-src-8add61763b21b8a771358ffb7487539302c74b89.tar.gz
MFC bmake changes to stable/10 (r255285,r255916,r258113,r258114,r261212,r266760,r268437)
Discussed with: sjg r255285: If MAKE_JOB_ERROR_TOKEN is set to false, do not put an error token ("E") into the job queue. This avoids closing down an entire build on failure of one branch. Probably has no use outside the context of universe/tinderbox. Reviewed by: obrien r255916: Fix Fx syntax. PR: 182269 Approved by: re@ r258113: Avoid SEGV when passed NULL for list r258114: Don't SEGV when Hash_Table is uninitialized r261212: Merge bmake-20140101 from vendor r266760: Portmgr no longer need the UL hack. Reviewed by: obrien r268437: Update to bmake-20140620 Main change is detection of malformed variable references. Reviewed by: obrien
Diffstat (limited to 'contrib/bmake/README')
-rw-r--r--contrib/bmake/README2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/bmake/README b/contrib/bmake/README
index fb688a3..d09e977 100644
--- a/contrib/bmake/README
+++ b/contrib/bmake/README
@@ -18,7 +18,7 @@ interesting changes, so that bmake tracks it very closely.
Building:
-The prefered way to bootstrap bmake is:
+The preferred way to bootstrap bmake is:
./bmake/boot-strap
OpenPOWER on IntegriCloud