diff options
| author | ru <ru@FreeBSD.org> | 2008-02-25 16:16:17 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2008-02-25 16:16:17 +0000 |
| commit | 26039ac2176a7a1304d7fceb821d54f7ef66bc82 (patch) | |
| tree | 28d6df447ce69fdf55af863e05d3236bf6853840 /usr.bin | |
| parent | 16e1a3004adbb3fd5113d3ddcbef13217bbb60bd (diff) | |
| download | FreeBSD-src-26039ac2176a7a1304d7fceb821d54f7ef66bc82.zip FreeBSD-src-26039ac2176a7a1304d7fceb821d54f7ef66bc82.tar.gz | |
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
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ar/Makefile | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile index 3e3e713..1639ed5 100644 --- a/usr.bin/ar/Makefile +++ b/usr.bin/ar/Makefile @@ -1,10 +1,6 @@ # $FreeBSD$ -.if defined(WITH_BSDAR) PROG= ar -.else -PROG= bsdar -.endif SRCS= ar.c read.c util.c write.c WARNS?= 5 @@ -12,17 +8,8 @@ WARNS?= 5 DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBELF} LDADD= -larchive -lbz2 -lz -lelf -.if defined(WITH_BSDAR) NO_SHARED?= yes LINKS= ${BINDIR}/ar ${BINDIR}/ranlib -MLINKS= ar ranlib -.else -LINKS= ${BINDIR}/bsdar ${BINDIR}/bsdranlib -MLINKS= bsdar.1 bsdranlib.1 - -CLEANFILES+= bsdar.1 -bsdar.1: ar.1 - ln -sf ${.ALLSRC} ${.TARGET} -.endif +MLINKS= ar.1 ranlib.1 .include <bsd.prog.mk> |
