From 2694e8c7f487ca2bccc3ccb50dfa2aa188b75c20 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 13 Dec 2001 17:00:59 +0000
Subject: [PATCH] Move NO_WERROR from CROSSENV to BMAKE.  In CROSSENV it
 disables it for the entire build.  We only want it for the bootstrap process.

Submitted by: ru
---
 Makefile.inc1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 803ce91b7699..4cd51195c81b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -177,15 +177,15 @@ CROSSENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
 		PERL5LIB=${WORLDTMP}/usr/libdata/perl/5.6.0 \
 		GROFF_BIN_PATH=${WORLDTMP}/usr/bin \
 		GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \
-		GROFF_TMAC_PATH=${WORLDTMP}/usr/share/tmac \
-		NO_WERROR=yes
+		GROFF_TMAC_PATH=${WORLDTMP}/usr/share/tmac
 
 # bootstrap-tool stage
 BMAKEENV=	MAKEOBJDIRPREFIX=${WORLDTMP} \
 		DESTDIR= \
 		INSTALL="sh ${.CURDIR}/tools/install.sh"
 BMAKE=		${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \
-		-DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED
+		-DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \
+		-DNO_WERROR
 
 # build-tool stage
 TMAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE} \