From owner-freebsd-toolchain@FreeBSD.ORG Fri Nov 9 10:52:33 2012 Return-Path: Delivered-To: toolchain@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2C7B8E02 for ; Fri, 9 Nov 2012 10:52:33 +0000 (UTC) (envelope-from erik@cederstrand.dk) Received: from csmtp3.one.com (csmtp3.one.com [91.198.169.23]) by mx1.freebsd.org (Postfix) with ESMTP id 6BFD58FC0A for ; Fri, 9 Nov 2012 10:52:32 +0000 (UTC) Received: from [192.168.1.18] (unknown [217.157.7.221]) by csmtp3.one.com (Postfix) with ESMTPA id 15F6C2403BDF for ; Fri, 9 Nov 2012 10:52:30 +0000 (UTC) From: Erik Cederstrand Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Subject: arflags cleanup Message-Id: <3D0FBCC4-743C-45B0-82E0-4C82501F7E60@cederstrand.dk> Date: Fri, 9 Nov 2012 11:52:29 +0100 To: "toolchain@freebsd.org" Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) X-Mailer: Apple Mail (2.1499) X-BeenThere: freebsd-toolchain@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Maintenance of FreeBSD's integrated toolchain List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Nov 2012 10:52:33 -0000 Hello toolchainers, I'm attempting to clean up hardcoded ar(1) flags in the tree to use the = global ARFLAGS in share/mk/sys.mk instead. I want to be able to add "-D" = to ARFLAGS and have it used everywhere. The patch changes some hardcoded flags from e.g. "cru" to the default = "rl" or "rv" from sys.mk. Looking at the manpage for ar(1), I'm pretty = sure this is safe, and my runtime tests haven't turned out any problems. = Loosing the "u" flags means loosing a bit in performance in theory, but = I have tested this to be negligible in a buildworld / kernel run. In a = later iteration, maybe the default flags can be added a "u". Are there any problems with this patch? Thanks, Erik Index: head/gnu/usr.bin/cc/cc_tools/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/gnu/usr.bin/cc/cc_tools/Makefile (revision 242822) +++ head/gnu/usr.bin/cc/cc_tools/Makefile (working copy) @@ -512,7 +512,7 @@ =20 ${LIBIBERTY}: ${LIBIBERTY_OBJS} @rm -f ${.TARGET} - @${AR} cq ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q` + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort = -q` ${RANLIB} ${.TARGET} CLEANFILES+=3D ${LIBIBERTY} ${LIBIBERTY_OBJS} =20 Index: head/gnu/lib/libgcc/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/gnu/lib/libgcc/Makefile (revision 242822) +++ head/gnu/lib/libgcc/Makefile (working copy) @@ -341,7 +341,7 @@ libgcc_eh.a: ${EH_OBJS_T} @${ECHO} building static gcc_eh library @rm -f ${.TARGET} - @${AR} cq ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q` + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q` ${RANLIB} ${.TARGET} =20 all: libgcc_eh.a @@ -350,7 +350,7 @@ libgcc_eh_p.a: ${EH_OBJS_P} @${ECHO} building profiled gcc_eh library @rm -f ${.TARGET} - @${AR} cq ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q` + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q` ${RANLIB} ${.TARGET} all: libgcc_eh_p.a .endif Index: head/share/mk/bsd.lib.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/share/mk/bsd.lib.mk (revision 242822) +++ head/share/mk/bsd.lib.mk (working copy) @@ -135,9 +135,9 @@ @${ECHO} building static ${LIB} library @rm -f ${.TARGET} .if !defined(NM) - @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` = ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | = tsort -q` ${ARADD} .else - @${AR} cq ${.TARGET} `NM=3D'${NM}' lorder ${OBJS} ${STATICOBJS} = | tsort -q` ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `NM=3D'${NM}' lorder ${OBJS} = ${STATICOBJS} | tsort -q` ${ARADD} .endif ${RANLIB} ${.TARGET} .endif @@ -152,9 +152,9 @@ @${ECHO} building profiled ${LIB} library @rm -f ${.TARGET} .if !defined(NM) - @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` = ${ARADD} .else - @${AR} cq ${.TARGET} `NM=3D'${NM}' lorder ${POBJS} | tsort -q` = ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `NM=3D'${NM}' lorder ${POBJS} | = tsort -q` ${ARADD} .endif ${RANLIB} ${.TARGET} .endif @@ -202,7 +202,7 @@ lib${LIB}_pic.a: ${SOBJS} @${ECHO} building special pic ${LIB} library @rm -f ${.TARGET} - @${AR} cq ${.TARGET} ${SOBJS} ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD} ${RANLIB} ${.TARGET} .endif =20 Index: head/crypto/openssl/Makefile.org =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/crypto/openssl/Makefile.org (revision 242822) +++ head/crypto/openssl/Makefile.org (working copy) @@ -63,7 +63,6 @@ PEX_LIBS=3D=20 EX_LIBS=3D=20 EXE_EXT=3D=20 -ARFLAGS=3D AR=3Dar $(ARFLAGS) r RANLIB=3D ranlib NM=3D nm Index: head/crypto/openssl/crypto/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/crypto/openssl/crypto/Makefile (revision 242822) +++ head/crypto/openssl/crypto/Makefile (working copy) @@ -13,7 +13,7 @@ MAKEDEPEND=3D $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE=3D Makefile RM=3D rm -f -AR=3D ar r +AR=3D ar ${ARFLAGS} =20 RECURSIVE_MAKE=3D [ -n "$(SDIRS)" ] && for i in $(SDIRS) ; do \ (cd $$i && echo "making $$target in $(DIR)/$$i..." = && \ Index: head/crypto/heimdal/appl/ftp/common/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/crypto/heimdal/appl/ftp/common/Makefile.in (revision = 242822) +++ head/crypto/heimdal/appl/ftp/common/Makefile.in (working copy) @@ -96,7 +96,6 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D LIBRARIES =3D $(noinst_LIBRARIES) -ARFLAGS =3D cru libcommon_a_AR =3D $(AR) $(ARFLAGS) libcommon_a_LIBADD =3D am_libcommon_a_OBJECTS =3D sockbuf.$(OBJEXT) buffer.$(OBJEXT) Index: head/crypto/heimdal/appl/telnet/libtelnet/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/crypto/heimdal/appl/telnet/libtelnet/Makefile.in = (revision 242822) +++ head/crypto/heimdal/appl/telnet/libtelnet/Makefile.in (working = copy) @@ -96,7 +96,6 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D LIBRARIES =3D $(noinst_LIBRARIES) -ARFLAGS =3D cru libtelnet_a_AR =3D $(AR) $(ARFLAGS) libtelnet_a_LIBADD =3D am_libtelnet_a_OBJECTS =3D auth.$(OBJEXT) enc_des.$(OBJEXT) \ Index: head/contrib/gperf/lib/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/gperf/lib/Makefile.in (revision 242822) +++ head/contrib/gperf/lib/Makefile.in (working copy) @@ -43,8 +43,8 @@ # Both C and C++ compiler OBJEXT =3D @OBJEXT@ # Other -AR =3D ar -AR_FLAGS =3D rc +AR =3D @AR@ +ARFLAGS =3D @ARFLAGS@ RANLIB =3D @RANLIB@ MV =3D mv LN =3D ln @@ -71,7 +71,7 @@ =20 $(TARGETLIB): $(OBJECTS) $(RM) $@ - $(AR) $(AR_FLAGS) $@ $(OBJECTS) + $(AR) $(ARFLAGS) $@ $(OBJECTS) $(RANLIB) $@ =20 # Don't use implicit rules, since AIX "make" and OSF/1 "make" don't = always Index: head/contrib/tcp_wrappers/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/tcp_wrappers/Makefile (revision 242822) +++ head/contrib/tcp_wrappers/Makefile (working copy) @@ -139,7 +139,7 @@ =20 freebsd: @make REAL_DAEMON_DIR=3D$(REAL_DAEMON_DIR) STYLE=3D$(STYLE) \ - RANLIB=3Dranlib ARFLAGS=3Drv AUX_OBJ=3D NETGROUP=3D-DNETGROUP = TLI=3D \ + RANLIB=3Dranlib ARFLAGS=3D$(ARFLAGS) AUX_OBJ=3D = NETGROUP=3D-DNETGROUP TLI=3D \ EXTRA_CFLAGS=3D"-DSYS_ERRLIST_DEFINED -DINET6 -DUSE_GETIPNODEBY" = \ VSYSLOG=3D all =20 @@ -401,7 +401,7 @@ RANLIB =3D ranlib # have ranlib (BSD-ish UNIX) #RANLIB =3D echo # no ranlib (SYSV-ish UNIX) =20 -ARFLAGS =3D rv # most systems +ARFLAGS ?=3D rv # most systems #ARFLAGS=3D rvs # IRIX 4.0.x =20 AR =3D ar Index: head/contrib/bind9/configure.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/bind9/configure.in (revision 242822) +++ head/contrib/bind9/configure.in (working copy) @@ -89,7 +89,6 @@ AC_CONFIG_FILES([make/rules make/includes]) =20 AC_PATH_PROG(AR, ar) -ARFLAGS=3D"cruv" AC_SUBST(AR) AC_SUBST(ARFLAGS) =20 Index: head/contrib/tcpdump/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/tcpdump/Makefile.in (revision 242822) +++ head/contrib/tcpdump/Makefile.in (working copy) @@ -366,7 +366,7 @@ =20 $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ) @rm -f $@ - $(AR) cr $@ $(LIBNETDISSECT_OBJ)=20 + $(AR) $(ARFLAGS) $@ $(LIBNETDISSECT_OBJ)=20 $(RANLIB) $@ =20 datalinks.o: $(srcdir)/missing/datalinks.c Index: head/contrib/gcc/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/gcc/Makefile.in (revision 242822) +++ head/contrib/gcc/Makefile.in (working copy) @@ -238,7 +238,7 @@ FLEX =3D @FLEX@ FLEXFLAGS =3D AR =3D @AR@ -AR_FLAGS =3D rc +ARFLAGS =3D @ARFLAGS@ NM =3D @NM@ RANLIB =3D @RANLIB@ RANLIB_FLAGS =3D @ranlib_flags@ @@ -1303,7 +1303,7 @@ # This archive is strictly for the host. libbackend.a: $(OBJS@onestep@) -rm -rf libbackend.a - $(AR) $(AR_FLAGS) libbackend.a $(OBJS@onestep@) + $(AR) $(ARFLAGS) libbackend.a $(OBJS@onestep@) -$(RANLIB) $(RANLIB_FLAGS) libbackend.a =20 # We call this executable `xgcc' rather than `gcc' Index: head/contrib/ntp/libparse/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/ntp/libparse/Makefile.in (revision 242822) +++ head/contrib/ntp/libparse/Makefile.in (working copy) @@ -52,7 +52,6 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D LIBRARIES =3D $(noinst_LIBRARIES) -ARFLAGS =3D cru libparse_a_AR =3D $(AR) $(ARFLAGS) libparse_a_LIBADD =3D am_libparse_a_OBJECTS =3D parse$U.$(OBJEXT) parse_conf$U.$(OBJEXT) \ Index: head/contrib/ntp/libntp/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/ntp/libntp/Makefile.in (revision 242822) +++ head/contrib/ntp/libntp/Makefile.in (working copy) @@ -52,7 +52,7 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D LIBRARIES =3D $(noinst_LIBRARIES) -ARFLAGS =3D cru +ARFLAGS =3D @ARFLAGS@ libntp_a_AR =3D $(AR) $(ARFLAGS) libntp_a_LIBADD =3D am__objects_1 =3D a_md5encrypt$U.$(OBJEXT) adjtime$U.$(OBJEXT) \ Index: head/contrib/ntp/arlib/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/ntp/arlib/Makefile.in (revision 242822) +++ head/contrib/ntp/arlib/Makefile.in (working copy) @@ -50,8 +50,8 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D LIBRARIES =3D $(noinst_LIBRARIES) -AR =3D ar -ARFLAGS =3D cru +AR =3D @AR@ +ARFLAGS =3D @ARFLAGS@ libares_a_AR =3D $(AR) $(ARFLAGS) libares_a_LIBADD =3D am_libares_a_OBJECTS =3D arlib.$(OBJEXT) Index: head/contrib/ntp/ntpd/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/ntp/ntpd/Makefile.in (revision 242822) +++ head/contrib/ntp/ntpd/Makefile.in (working copy) @@ -58,7 +58,7 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D LIBRARIES =3D $(noinst_LIBRARIES) -ARFLAGS =3D cru +ARFLAGS =3D @ARFLAGS@ libntpd_a_AR =3D $(AR) $(ARFLAGS) libntpd_a_LIBADD =3D am_libntpd_a_OBJECTS =3D ntp_control$U.$(OBJEXT) ntp_crypto$U.$(OBJEXT) = \ Index: head/contrib/binutils/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/binutils/Makefile.in (revision 242822) +++ head/contrib/binutils/Makefile.in (working copy) @@ -284,7 +284,7 @@ =20 AS =3D @AS@ AR =3D @AR@ -AR_FLAGS =3D rc +ARFLAGS =3D @ARFLAGS@ CC =3D @CC@ CXX =3D @CXX@ DLLTOOL =3D @DLLTOOL@ @@ -474,7 +474,7 @@ "SHELL=3D$(SHELL)" \ "YACC=3D$(YACC)" \ "`echo 'ADAFLAGS=3D$(ADAFLAGS)' | sed -e = s'/[^=3D][^=3D]*=3D$$/XFOO=3D/'`" \ - "AR_FLAGS=3D$(AR_FLAGS)" \ + "AR_FLAGS=3D$(ARFLAGS)" \ "`echo 'BOOT_ADAFLAGS=3D$(BOOT_ADAFLAGS)' | sed -e = s'/[^=3D][^=3D]*=3D$$/XFOO=3D/'`" \ "BOOT_CFLAGS=3D$(BOOT_CFLAGS)" \ "BOOT_LDFLAGS=3D$(BOOT_LDFLAGS)" \ Index: head/contrib/binutils/libiberty/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/binutils/libiberty/Makefile.in (revision 242822) +++ head/contrib/binutils/libiberty/Makefile.in (working copy) @@ -56,7 +56,7 @@ OUTPUT_OPTION =3D @OUTPUT_OPTION@ =20 AR =3D @AR@ -AR_FLAGS =3D rc +ARFLAGS =3D @ARFLAGS@ =20 CC =3D @CC@ CFLAGS =3D @CFLAGS@ @@ -81,7 +81,7 @@ # Flags to pass to a recursive make. FLAGS_TO_PASS =3D \ "AR=3D$(AR)" \ - "AR_FLAGS=3D$(AR_FLAGS)" \ + "AR_FLAGS=3D$(ARFLAGS)" \ "CC=3D$(CC)" \ "CFLAGS=3D$(CFLAGS)" \ "DESTDIR=3D$(DESTDIR)" \ @@ -224,12 +224,12 @@ =20 $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) -rm -f $(TARGETLIB) pic/$(TARGETLIB) - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(RANLIB) $(TARGETLIB) if [ x"$(PICFLAG)" !=3D x ]; then \ cd pic; \ - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \ $(RANLIB) $(TARGETLIB); \ cd ..; \ @@ -237,7 +237,7 @@ =20 $(TESTLIB): $(REQUIRED_OFILES) $(CONFIGURED_OFILES) -rm -f $(TESTLIB) - $(AR) $(AR_FLAGS) $(TESTLIB) \ + $(AR) $(ARFLAGS) $(TESTLIB) \ $(REQUIRED_OFILES) $(CONFIGURED_OFILES) $(RANLIB) $(TESTLIB) =20 Index: head/contrib/binutils/Makefile.tpl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/binutils/Makefile.tpl (revision 242822) +++ head/contrib/binutils/Makefile.tpl (working copy) @@ -287,7 +287,7 @@ =20 AS =3D @AS@ AR =3D @AR@ -AR_FLAGS =3D rc +ARFLAGS =3D @ARFLAGS@ CC =3D @CC@ CXX =3D @CXX@ DLLTOOL =3D @DLLTOOL@ Index: head/contrib/opie/libopie/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/opie/libopie/Makefile.in (revision 242822) +++ head/contrib/opie/libopie/Makefile.in (working copy) @@ -23,7 +23,7 @@ all: $(TARGET) =20 $(TARGET): $(OBJS) - ar cr $(TARGET) $(OBJS) + @AR@ @ARFLAGS@ $(TARGET) $(OBJS) @RANLIB@ $(TARGET) =20 clean: Index: head/contrib/opie/libmissing/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/opie/libmissing/Makefile.in (revision 242822) +++ head/contrib/opie/libmissing/Makefile.in (working copy) @@ -22,7 +22,7 @@ all: $(TARGET) =20 $(TARGET): $(OBJS) - ar cr $(TARGET) $(OBJS) + @AR@ @ARFLAGS@ $(TARGET) $(OBJS) @RANLIB@ $(TARGET) =20 clean: Index: head/contrib/gcclibs/libiberty/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/gcclibs/libiberty/Makefile.in (revision 242822) +++ head/contrib/gcclibs/libiberty/Makefile.in (working copy) @@ -56,7 +56,7 @@ OUTPUT_OPTION =3D @OUTPUT_OPTION@ =20 AR =3D @AR@ -AR_FLAGS =3D rc +ARFLAGS =3D @ARFLAGS@ =20 CC =3D @CC@ CFLAGS =3D @CFLAGS@ @@ -81,7 +81,7 @@ # Flags to pass to a recursive make. FLAGS_TO_PASS =3D \ "AR=3D$(AR)" \ - "AR_FLAGS=3D$(AR_FLAGS)" \ + "AR_FLAGS=3D$(ARFLAGS)" \ "CC=3D$(CC)" \ "CFLAGS=3D$(CFLAGS)" \ "DESTDIR=3D$(DESTDIR)" \ @@ -224,12 +224,12 @@ =20 $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) -rm -f $(TARGETLIB) pic/$(TARGETLIB) - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(RANLIB) $(TARGETLIB) if [ x"$(PICFLAG)" !=3D x ]; then \ cd pic; \ - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \ $(RANLIB) $(TARGETLIB); \ cd ..; \ @@ -237,7 +237,7 @@ =20 $(TESTLIB): $(REQUIRED_OFILES) $(CONFIGURED_OFILES) -rm -f $(TESTLIB) - $(AR) $(AR_FLAGS) $(TESTLIB) \ + $(AR) $(ARFLAGS) $(TESTLIB) \ $(REQUIRED_OFILES) $(CONFIGURED_OFILES) $(RANLIB) $(TESTLIB) =20 Index: head/contrib/gcclibs/libcpp/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/gcclibs/libcpp/Makefile.in (revision 242822) +++ head/contrib/gcclibs/libcpp/Makefile.in (working copy) @@ -26,8 +26,8 @@ top_builddir =3D . VPATH =3D @srcdir@ INSTALL =3D @INSTALL@ -AR =3D ar -ARFLAGS =3D cru +AR =3D @AR@ +ARFLAGS =3D @ARFLAGS@ ACLOCAL =3D @ACLOCAL@ AUTOCONF =3D @AUTOCONF@ AUTOHEADER =3D @AUTOHEADER@ Index: head/contrib/gcclibs/libdecnumber/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/gcclibs/libdecnumber/Makefile.in (revision = 242822) +++ head/contrib/gcclibs/libdecnumber/Makefile.in (working copy) @@ -26,8 +26,8 @@ top_builddir =3D . VPATH =3D @srcdir@ INSTALL =3D @INSTALL@ -AR =3D ar -ARFLAGS =3D cru +AR =3D @AR@ +ARFLAGS =3D @ARFLAGS@ ACLOCAL =3D @ACLOCAL@ AUTOCONF =3D @AUTOCONF@ AUTOHEADER =3D @AUTOHEADER@ Index: head/contrib/dtc/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/dtc/Makefile (revision 242822) +++ head/contrib/dtc/Makefile (working copy) @@ -48,7 +48,6 @@ VECHO =3D : else VECHO =3D echo " " -ARFLAGS =3D rc .SILENT: endif =20 Index: head/contrib/cvs/diff/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/cvs/diff/Makefile.in (revision 242822) +++ head/contrib/cvs/diff/Makefile.in (working copy) @@ -41,8 +41,8 @@ CONFIG_HEADER =3D $(top_builddir)/config.h CONFIG_CLEAN_FILES =3D LIBRARIES =3D $(noinst_LIBRARIES) -AR =3D ar -ARFLAGS =3D cru +AR =3D @AR@ +ARFLAGS =3D @ARFLAGS@ libdiff_a_AR =3D $(AR) $(ARFLAGS) libdiff_a_LIBADD =3D am_libdiff_a_OBJECTS =3D diff.$(OBJEXT) diff3.$(OBJEXT) \ Index: head/contrib/cvs/lib/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/cvs/lib/Makefile.in (revision 242822) +++ head/contrib/cvs/lib/Makefile.in (working copy) @@ -63,8 +63,8 @@ CONFIG_HEADER =3D $(top_builddir)/config.h CONFIG_CLEAN_FILES =3D fnmatch.h LIBRARIES =3D $(noinst_LIBRARIES) -AR =3D ar -ARFLAGS =3D cru +AR =3D @AR@ +ARFLAGS =3D @ARFLAGS@ libcvs_a_AR =3D $(AR) $(ARFLAGS) libcvs_a_DEPENDENCIES =3D @LIBOBJS@ am_libcvs_a_OBJECTS =3D argmatch.$(OBJEXT) getdate.$(OBJEXT) \ Index: head/contrib/gdtoa/makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head/contrib/gdtoa/makefile (revision 242822) +++ head/contrib/gdtoa/makefile (working copy) @@ -52,12 +52,12 @@ strtopx.c strtopxL.c strtorQ.c strtord.c strtordd.c strtorf.c\ strtorx.c strtorxL.c sum.c ulp.c $(CC) -c $(CFLAGS) $? - x=3D`echo $? | sed 's/\.c/.o/g'` && ar ruv gdtoa.a $$x && rm $$x + x=3D`echo $? | sed 's/\.c/.o/g'` && $(AR) $(ARFLAGS) gdtoa.a $$x = && rm $$x ranlib gdtoa.a || true =20 Printf: all printf.c $(CC) -c $(CFLAGS) printf.c - ar ruv gdtoa.a printf.o + $(AR) $(ARFLAGS) gdtoa.a printf.o rm printf.o touch Printf