d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elftoolchain: Use ${SRCTOP} for the top of the FreeBSD tree

Browse Source 
It's provided by sys.mk so there's no need to derive it from ${.CURDIR}.

Suggested by:	ngie
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D5998
This commit is contained in:
Ed Maste 2016-04-21 12:58:29 +00:00
parent 53219aa88a
commit 2821bdccaa
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libdwarf/Makefile
View File

@ -2,8 +2,8 @@
.include <bsd.own.mk>
PACKAGE=lib${LIB}
TOP= ${.CURDIR:H:H}/contrib/elftoolchain
SRCDIR= ${TOP}/libdwarf
ELFTCDIR=${SRCTOP}/contrib/elftoolchain
SRCDIR= ${ELFTCDIR}/libdwarf
.PATH: ${SRCDIR}
@ -92,7 +92,7 @@ GENSRCS= dwarf_pubnames.c dwarf_pubtypes.c dwarf_weaks.c \
dwarf_pro_vars.c
CLEANFILES= ${GENSRCS}
CLEANDIRS= sys
CFLAGS+= -I. -I${SRCDIR} -I${TOP}/common -I${TOP}/libelf
CFLAGS+= -I. -I${SRCDIR} -I${ELFTCDIR}/common -I${ELFTCDIR}/libelf
sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} .NOMETA
mkdir -p ${.OBJDIR}/sys

6
lib/libelf/Makefile
View File

@ -5,8 +5,8 @@ SHLIBDIR?= /lib
.include <bsd.own.mk>
TOP= ${.CURDIR:H:H}/contrib/elftoolchain
SRCDIR= ${TOP}/libelf
ELFTCDIR=${SRCTOP}/contrib/elftoolchain
SRCDIR= ${ELFTCDIR}/libelf
.PATH: ${SRCDIR}
@ -80,7 +80,7 @@ SRCS+= sys/elf32.h sys/elf64.h sys/elf_common.h
GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c
CLEANFILES= ${GENSRCS}
CLEANDIRS= sys
CFLAGS+= -I. -I${SRCDIR} -I${TOP}/common
CFLAGS+= -I. -I${SRCDIR} -I${ELFTCDIR}/common
sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} .NOMETA
mkdir -p ${.OBJDIR}/sys

2
lib/libelftc/Makefile
View File

@ -4,7 +4,7 @@
PACKAGE=lib${LIB}
INTERNALLIB=
ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
.PATH: ${ELFTCDIR}/libelftc

2
usr.bin/addr2line/Makefile
View File

@ -2,7 +2,7 @@
.include <src.opts.mk>
ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
ADDR2LINEDIR= ${ELFTCDIR}/addr2line
.PATH: ${ADDR2LINEDIR}

2
usr.bin/cxxfilt/Makefile
View File

@ -2,7 +2,7 @@
.include <src.opts.mk>
ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
SRCDIR= ${ELFTCDIR}/cxxfilt
.PATH: ${SRCDIR}

2
usr.bin/elfcopy/Makefile
View File

@ -2,7 +2,7 @@
.include <src.opts.mk>
ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
ELFCOPYDIR= ${ELFTCDIR}/elfcopy
.PATH: ${ELFCOPYDIR}

2
usr.bin/nm/Makefile
View File

@ -2,7 +2,7 @@
.include <src.opts.mk>
ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
NMDIR= ${ELFTCDIR}/nm
.PATH: ${NMDIR}

2
usr.bin/readelf/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
READELFDIR= ${ELFTCDIR}/readelf
.PATH: ${READELFDIR}

2
usr.bin/size/Makefile
View File

@ -2,7 +2,7 @@
.include <src.opts.mk>
ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
SIZEDIR= ${ELFTCDIR}/size
.PATH: ${SIZEDIR}

2
usr.bin/strings/Makefile
View File

@ -2,7 +2,7 @@
.include <src.opts.mk>
ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
.PATH: ${ELFTCDIR}/strings