summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2014-01-30 21:37:43 +0000
committerbrooks <brooks@FreeBSD.org>2014-01-30 21:37:43 +0000
commit1c3cc9d2e55579d70f45a5201804f2503cc725d7 (patch)
tree4d627eb35c91e6981860a5d1f476f41991a79818 /tools
parentf98dd9df2664c43084ea0687416ba1e37b374ba7 (diff)
downloadFreeBSD-src-1c3cc9d2e55579d70f45a5201804f2503cc725d7.zip
FreeBSD-src-1c3cc9d2e55579d70f45a5201804f2503cc725d7.tar.gz
Merge from CheriBSD:
commit 2d581e8caf79d7a0f5a24590eccd06da90cccb74 Author: Brooks Davis <brooks@one-eyed-alien.net> Date: Mon Jan 27 22:57:51 2014 +0000 Add WITHOUT_FMTREE to disable building fmtree. MFC after: 4 weeks Sponsored by: DARPA, AFRL
Diffstat (limited to 'tools')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc5
-rw-r--r--tools/build/options/WITHOUT_FMTREE3
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 1cf40b3..91a5aaf 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -600,6 +600,11 @@ OLD_FILES+=usr/bin/g++
OLD_FILES+=usr/libexec/cc1plus
.endif
+.if ${MK_FMTREE} == no
+OLD_FILES+=usr/sbin/fmtree
+OLD_FILES+=usr/share/man/man8/fmtree.8.gz
+.endif
+
.if ${MK_GNUCXX} == no
OLD_FILES+=usr/bin/g++
OLD_FILES+=usr/include/c++/4.2/algorithm
diff --git a/tools/build/options/WITHOUT_FMTREE b/tools/build/options/WITHOUT_FMTREE
new file mode 100644
index 0000000..f8225c1
--- /dev/null
+++ b/tools/build/options/WITHOUT_FMTREE
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build and install
+.Pa /usr/sbin/fmtree .
OpenPOWER on IntegriCloud