diff options
| author | emaste <emaste@FreeBSD.org> | 2016-04-21 12:58:29 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2016-04-21 12:58:29 +0000 |
| commit | 55c6dd387976111bbcfd088fe769dafa767021bc (patch) | |
| tree | 0063aee2166157b20b3d10fff6c319161a3b1619 | |
| parent | 39859f6ff983fcd0a0c2857cee891566c7b63baf (diff) | |
| download | FreeBSD-src-55c6dd387976111bbcfd088fe769dafa767021bc.zip FreeBSD-src-55c6dd387976111bbcfd088fe769dafa767021bc.tar.gz | |
elftoolchain: Use ${SRCTOP} for the top of the FreeBSD tree
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
| -rw-r--r-- | lib/libdwarf/Makefile | 6 | ||||
| -rw-r--r-- | lib/libelf/Makefile | 6 | ||||
| -rw-r--r-- | lib/libelftc/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/addr2line/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/cxxfilt/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/elfcopy/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/nm/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/readelf/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/size/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/strings/Makefile | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile index e23cb1f..e2bb5a5 100644 --- a/lib/libdwarf/Makefile +++ b/lib/libdwarf/Makefile @@ -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 diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile index fc956bf..55ce30b 100644 --- a/lib/libelf/Makefile +++ b/lib/libelf/Makefile @@ -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 diff --git a/lib/libelftc/Makefile b/lib/libelftc/Makefile index 7a4203d..b688d2e 100644 --- a/lib/libelftc/Makefile +++ b/lib/libelftc/Makefile @@ -4,7 +4,7 @@ PACKAGE=lib${LIB} INTERNALLIB= -ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain +ELFTCDIR= ${SRCTOP}/contrib/elftoolchain .PATH: ${ELFTCDIR}/libelftc diff --git a/usr.bin/addr2line/Makefile b/usr.bin/addr2line/Makefile index 6fe20f3..fe9883f 100644 --- a/usr.bin/addr2line/Makefile +++ b/usr.bin/addr2line/Makefile @@ -2,7 +2,7 @@ .include <src.opts.mk> -ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain +ELFTCDIR= ${SRCTOP}/contrib/elftoolchain ADDR2LINEDIR= ${ELFTCDIR}/addr2line .PATH: ${ADDR2LINEDIR} diff --git a/usr.bin/cxxfilt/Makefile b/usr.bin/cxxfilt/Makefile index 0f7b596..75f3941 100644 --- a/usr.bin/cxxfilt/Makefile +++ b/usr.bin/cxxfilt/Makefile @@ -2,7 +2,7 @@ .include <src.opts.mk> -ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain +ELFTCDIR= ${SRCTOP}/contrib/elftoolchain SRCDIR= ${ELFTCDIR}/cxxfilt .PATH: ${SRCDIR} diff --git a/usr.bin/elfcopy/Makefile b/usr.bin/elfcopy/Makefile index 444fa18..cc99fa3 100644 --- a/usr.bin/elfcopy/Makefile +++ b/usr.bin/elfcopy/Makefile @@ -2,7 +2,7 @@ .include <src.opts.mk> -ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain +ELFTCDIR= ${SRCTOP}/contrib/elftoolchain ELFCOPYDIR= ${ELFTCDIR}/elfcopy .PATH: ${ELFCOPYDIR} diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile index 0b8e223..113553f 100644 --- a/usr.bin/nm/Makefile +++ b/usr.bin/nm/Makefile @@ -2,7 +2,7 @@ .include <src.opts.mk> -ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain +ELFTCDIR= ${SRCTOP}/contrib/elftoolchain NMDIR= ${ELFTCDIR}/nm .PATH: ${NMDIR} diff --git a/usr.bin/readelf/Makefile b/usr.bin/readelf/Makefile index 4919f7a..8f7dec5 100644 --- a/usr.bin/readelf/Makefile +++ b/usr.bin/readelf/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain +ELFTCDIR= ${SRCTOP}/contrib/elftoolchain READELFDIR= ${ELFTCDIR}/readelf .PATH: ${READELFDIR} diff --git a/usr.bin/size/Makefile b/usr.bin/size/Makefile index 54b512b..d7c8e41 100644 --- a/usr.bin/size/Makefile +++ b/usr.bin/size/Makefile @@ -2,7 +2,7 @@ .include <src.opts.mk> -ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain +ELFTCDIR= ${SRCTOP}/contrib/elftoolchain SIZEDIR= ${ELFTCDIR}/size .PATH: ${SIZEDIR} diff --git a/usr.bin/strings/Makefile b/usr.bin/strings/Makefile index 68e37b8..e3c82f4 100644 --- a/usr.bin/strings/Makefile +++ b/usr.bin/strings/Makefile @@ -2,7 +2,7 @@ .include <src.opts.mk> -ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain +ELFTCDIR= ${SRCTOP}/contrib/elftoolchain .PATH: ${ELFTCDIR}/strings |
