Page MenuHomeFreeBSD
Files F147179104

D5998.diff
No OneTemporary
Actions

D5998.diff
View Options

Index: head/lib/libdwarf/Makefile
===================================================================
--- head/lib/libdwarf/Makefile
+++ head/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 @@
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
Index: head/lib/libelf/Makefile
===================================================================
--- head/lib/libelf/Makefile
+++ head/lib/libelf/Makefile
@@ -5,8 +5,8 @@
.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 @@
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
Index: head/lib/libelftc/Makefile
===================================================================
--- head/lib/libelftc/Makefile
+++ head/lib/libelftc/Makefile
@@ -4,7 +4,7 @@
PACKAGE=lib${LIB}
INTERNALLIB=
-ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
+ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
.PATH: ${ELFTCDIR}/libelftc
Index: head/usr.bin/addr2line/Makefile
===================================================================
--- head/usr.bin/addr2line/Makefile
+++ head/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}
Index: head/usr.bin/cxxfilt/Makefile
===================================================================
--- head/usr.bin/cxxfilt/Makefile
+++ head/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}
Index: head/usr.bin/elfcopy/Makefile
===================================================================
--- head/usr.bin/elfcopy/Makefile
+++ head/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}
Index: head/usr.bin/nm/Makefile
===================================================================
--- head/usr.bin/nm/Makefile
+++ head/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}
Index: head/usr.bin/readelf/Makefile
===================================================================
--- head/usr.bin/readelf/Makefile
+++ head/usr.bin/readelf/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
+ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
READELFDIR= ${ELFTCDIR}/readelf
.PATH: ${READELFDIR}
Index: head/usr.bin/size/Makefile
===================================================================
--- head/usr.bin/size/Makefile
+++ head/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}
Index: head/usr.bin/strings/Makefile
===================================================================
--- head/usr.bin/strings/Makefile
+++ head/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

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 9, 9:31 PM (15 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29458810
Default Alt Text
D5998.diff (4 KB)

Event Timeline