Set AR=gnu-ar and RANLIB=gnu-ranlib on systems where we are forced

to use GNU tools.  Remove the _WITH_GNUAR knob.

Prodded by:	obrien

Makefile.inc1

@@ -203,6 +203,9 @@ CROSSENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
 		GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
 		GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
 		GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
+.if ${OSRELDATE} < 700044
+CROSSENV+=	AR=gnu-ar RANLIB=gnu-ranlib
+.endif
 
 # bootstrap-tools stage
 BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -972,10 +975,6 @@ _kgzip=		usr.sbin/kgzip
 .endif
 .endif
 
-.if make(cross-tools) && ${BOOTSTRAPPING} < 700044
-.MAKEFLAGS+=	-D_WITH_GNUAR
-.endif
-
 cross-tools:
 .for _tool in \
     gnu/usr.bin/binutils \

gnu/usr.bin/binutils/ar/Makefile

@@ -4,13 +4,11 @@
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
-.if !defined(_WITH_GNUAR)
 PROGNAME= gnu-ar
 MAN=   gnu-ar.1
 gnu-ar.1: ar.1
 	cat ${.ALLSRC} > ${.TARGET}
 CLEANFILES+= gnu-ar.1
-.endif
 
 PROG=	ar
 SRCS=	ar.c not-ranlib.c

gnu/usr.bin/binutils/ranlib/Makefile

@@ -4,13 +4,11 @@
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
-.if !defined(_WITH_GNUAR)
 PROGNAME= gnu-ranlib
 MAN=	gnu-ranlib.1
 gnu-ranlib.1: ranlib.1
 	cat ${.ALLSRC} > ${.TARGET}
 CLEANFILES+= gnu-ranlib.1
-.endif
 
 PROG=	ranlib
 SRCS=	ar.c is-ranlib.c