From 26039ac2176a7a1304d7fceb821d54f7ef66bc82 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Mon, 25 Feb 2008 16:16:17 +0000
Subject: Make again BSD ar(1) the default system ar(1), now properly handling
 source upgrades by falling back to GNU ar(1) as necessary.  Option WITH_BSDAR
 is gone.  Option _WITH_GNUAR to aid in upgrades is *not* supposed to be set
 by the user.

Stop bootstrapping BSD ar(1) on the next __FreeBSD_version bump, as
there are no known bugs in it.  Bump __FreeBSD_version to anticipate
this and to flag the switch to BSD ar(1), should it be needed for
something.

Input from:	obrien, des, kaiw
---
 Makefile.inc1 | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index 1ff4ea1..039d879 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -872,6 +872,10 @@ _groff=		gnu/usr.bin/groff/tmac
 .endif
 .endif
 
+.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022
+_ar=		usr.bin/ar
+.endif
+
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -891,6 +895,7 @@ bootstrap-tools:
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
+    ${_ar} \
     usr.bin/lorder \
     usr.bin/makewhatis \
     usr.bin/rpcgen \
@@ -967,6 +972,10 @@ _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 \
-- 
cgit v1.1