diff options
author | ru <ru@FreeBSD.org> | 2008-03-02 11:10:46 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2008-03-02 11:10:46 +0000 |
commit | d9f8b4ad275db6dce833d018c5d4561f9dbf5a53 (patch) | |
tree | b131fc368eff8f257672b76c058bf72455ff9de1 | |
parent | daec28c548d6859f11798cb56bc67d05c42165fb (diff) | |
download | FreeBSD-src-d9f8b4ad275db6dce833d018c5d4561f9dbf5a53.zip FreeBSD-src-d9f8b4ad275db6dce833d018c5d4561f9dbf5a53.tar.gz |
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
-rw-r--r-- | Makefile.inc1 | 7 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/ar/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/ranlib/Makefile | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index eebd76e..86fe56d 100644 --- a/Makefile.inc1 +++ b/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 \ diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile index 32f340d..464445e 100644 --- a/gnu/usr.bin/binutils/ar/Makefile +++ b/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 diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile index 792824b..8679375 100644 --- a/gnu/usr.bin/binutils/ranlib/Makefile +++ b/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 |