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
This commit is contained in:
parent
c3b02504bc
commit
b18c84b4db
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=176737
@ -203,6 +203,9 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \
|
|||||||
GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
|
GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
|
||||||
GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
|
GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
|
||||||
GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
|
GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
|
||||||
|
.if ${OSRELDATE} < 700044
|
||||||
|
CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib
|
||||||
|
.endif
|
||||||
|
|
||||||
# bootstrap-tools stage
|
# bootstrap-tools stage
|
||||||
BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
|
BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
|
||||||
@ -972,10 +975,6 @@ _kgzip= usr.sbin/kgzip
|
|||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if make(cross-tools) && ${BOOTSTRAPPING} < 700044
|
|
||||||
.MAKEFLAGS+= -D_WITH_GNUAR
|
|
||||||
.endif
|
|
||||||
|
|
||||||
cross-tools:
|
cross-tools:
|
||||||
.for _tool in \
|
.for _tool in \
|
||||||
gnu/usr.bin/binutils \
|
gnu/usr.bin/binutils \
|
||||||
|
@ -4,13 +4,11 @@
|
|||||||
|
|
||||||
.PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
|
.PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
|
||||||
|
|
||||||
.if !defined(_WITH_GNUAR)
|
|
||||||
PROGNAME= gnu-ar
|
PROGNAME= gnu-ar
|
||||||
MAN= gnu-ar.1
|
MAN= gnu-ar.1
|
||||||
gnu-ar.1: ar.1
|
gnu-ar.1: ar.1
|
||||||
cat ${.ALLSRC} > ${.TARGET}
|
cat ${.ALLSRC} > ${.TARGET}
|
||||||
CLEANFILES+= gnu-ar.1
|
CLEANFILES+= gnu-ar.1
|
||||||
.endif
|
|
||||||
|
|
||||||
PROG= ar
|
PROG= ar
|
||||||
SRCS= ar.c not-ranlib.c
|
SRCS= ar.c not-ranlib.c
|
||||||
|
@ -4,13 +4,11 @@
|
|||||||
|
|
||||||
.PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
|
.PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
|
||||||
|
|
||||||
.if !defined(_WITH_GNUAR)
|
|
||||||
PROGNAME= gnu-ranlib
|
PROGNAME= gnu-ranlib
|
||||||
MAN= gnu-ranlib.1
|
MAN= gnu-ranlib.1
|
||||||
gnu-ranlib.1: ranlib.1
|
gnu-ranlib.1: ranlib.1
|
||||||
cat ${.ALLSRC} > ${.TARGET}
|
cat ${.ALLSRC} > ${.TARGET}
|
||||||
CLEANFILES+= gnu-ranlib.1
|
CLEANFILES+= gnu-ranlib.1
|
||||||
.endif
|
|
||||||
|
|
||||||
PROG= ranlib
|
PROG= ranlib
|
||||||
SRCS= ar.c is-ranlib.c
|
SRCS= ar.c is-ranlib.c
|
||||||
|
Loading…
Reference in New Issue
Block a user