From: imp <imp@FreeBSD.org>
Date: Thu, 12 Nov 2015 17:23:31 +0000 (+0000)
Subject: NO_CPU_OPTFLAGS doesn't exist, so don't document it.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=547fe7aa6e80ab8518c19d9fb721ff7e89ae74ac;p=people%2Fliuw%2Ffreebsd.git

NO_CPU_OPTFLAGS doesn't exist, so don't document it.
---

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 613eb026761..4925d990036 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -52,7 +52,6 @@
 #
 #CPUTYPE?=pentium3
 #NO_CPU_CFLAGS=		# Don't add -march=<cpu> to CFLAGS automatically
-#NO_CPU_COPTFLAGS=	# Don't add -march=<cpu> to COPTFLAGS automatically
 #
 # CFLAGS controls the compiler settings used when compiling C code.
 # Note that optimization settings other than -O and -O2 are not recommended
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index e70574963f1..dd5399257db 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 17, 2014
+.Dd November 12, 2015
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -165,13 +165,9 @@ to contain the appropriate optimization directive to
 .Xr cc 1 .
 The automatic setting of
 .Va CFLAGS
-and
-.Va COPTFLAGS
 may be overridden using the
 .Va NO_CPU_CFLAGS
-and
-.Va NO_CPU_COPTFLAGS
-variables, respectively.
+variable.
 Refer to
 .Pa /usr/share/examples/etc/make.conf
 for a list of recognized
@@ -231,12 +227,6 @@ Setting this variable will prevent CPU specific compiler flags
 from being automatically added to
 .Va CFLAGS
 during compile time.
-.It Va NO_CPU_COPTFLAGS
-.Pq Vt str
-Setting this variable will prevent CPU specific compiler flags
-from being automatically added to
-.Va COPTFLAGS
-during compile time.
 .It Va NO_DOCUPDATE
 .Pq Vt bool
 Set this to not update the doc tree during