mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-05 09:14:03 +00:00
* Connect ar(1) to the build and make it default ar. Rename GNU
binutils ar and ranlib to gar and granlib, respectively. * Introduce a temporary variable WITH_GNUAR as a safety net. When buildworld with -DWITH_GNUAR, GNU binutils ar and ranlib will install as default ones and 'BSD' ar will be disabled. * Bump __FreeBSD_version to reflect the import of 'BSD' ar(1). Approved by: jkoshy (mentor)
This commit is contained in:
parent
741ac35cd4
commit
d0e2abaf12
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=176437
@ -4,7 +4,12 @@
|
||||
|
||||
.PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
|
||||
|
||||
.if defined(WITH_GNUAR)
|
||||
PROG= ar
|
||||
.else
|
||||
PROG= gar
|
||||
MAN= ar.1
|
||||
.endif
|
||||
SRCS= ar.c not-ranlib.c
|
||||
CFLAGS+= -D_GNU_SOURCE
|
||||
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
|
||||
|
@ -4,7 +4,12 @@
|
||||
|
||||
.PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
|
||||
|
||||
.if defined(WITH_GNUAR)
|
||||
PROG= ranlib
|
||||
.else
|
||||
PROG= granlib
|
||||
MAN= ranlib.1
|
||||
.endif
|
||||
SRCS= ar.c is-ranlib.c
|
||||
CFLAGS+= -D_GNU_SOURCE
|
||||
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
|
||||
|
@ -57,7 +57,7 @@
|
||||
* is created, otherwise 1.
|
||||
*/
|
||||
#undef __FreeBSD_version
|
||||
#define __FreeBSD_version 800021 /* Master, propagated to newvers */
|
||||
#define __FreeBSD_version 800022 /* Master, propagated to newvers */
|
||||
|
||||
#ifndef LOCORE
|
||||
#include <sys/types.h>
|
||||
|
@ -232,6 +232,10 @@ SUBDIR= alias \
|
||||
${_ypmatch} \
|
||||
${_ypwhich}
|
||||
|
||||
.if !defined(WITH_GNUAR)
|
||||
SUBDIR+= ar
|
||||
.endif
|
||||
|
||||
.if ${MACHINE_ARCH} != "arm"
|
||||
_truss= truss
|
||||
.endif
|
||||
|
Loading…
Reference in New Issue
Block a user