[src/trunk]: src/tools Update 'tools/ctf{merge,convert}' to use the new build...

[jkoshy <jkoshy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8382c4f50a63
branches:  trunk
changeset: 365699:8382c4f50a63
user:      jkoshy <jkoshy%NetBSD.org@localhost>
date:      Mon Apr 18 19:40:06 2022 +0000

description:
Update 'tools/ctf{merge,convert}' to use the new build locations for
'libelf' and 'libdwarf'.

diffstat:

 tools/ctfconvert/Makefile |  6 +++---
 tools/ctfmerge/Makefile   |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r a3ce8d32d654 -r 8382c4f50a63 tools/ctfconvert/Makefile
--- a/tools/ctfconvert/Makefile Mon Apr 18 16:09:05 2022 +0000
+++ b/tools/ctfconvert/Makefile Mon Apr 18 19:40:06 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2018/05/01 19:59:46 christos Exp $
+#      $NetBSD: Makefile,v 1.10 2022/04/18 19:40:06 jkoshy Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -45,8 +45,8 @@
 OPENSOLARIS_DISTDIR= ${OSNETDIR}/dist
 
 CTFOBJ!=       cd ${.CURDIR}/../libctf && ${PRINTOBJDIR}
-DWARFOBJ!=     cd ${.CURDIR}/../libdwarf && ${PRINTOBJDIR}
-ELFOBJ!=       cd ${.CURDIR}/../libelf && ${PRINTOBJDIR}
+DWARFOBJ!=     cd ${.CURDIR}/../elftoolchain/libdwarf && ${PRINTOBJDIR}
+ELFOBJ!=       cd ${.CURDIR}/../elftoolchain/libelf && ${PRINTOBJDIR}
 LDADD+=                -L${CTFOBJ} -lctf
 DPADD+=                ${CTFOBJ}/libctf.a
 LDADD+=                -L${DWARFOBJ} -ldwarf
diff -r a3ce8d32d654 -r 8382c4f50a63 tools/ctfmerge/Makefile
--- a/tools/ctfmerge/Makefile   Mon Apr 18 16:09:05 2022 +0000
+++ b/tools/ctfmerge/Makefile   Mon Apr 18 19:40:06 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2018/05/01 19:59:46 christos Exp $
+#      $NetBSD: Makefile,v 1.11 2022/04/18 19:40:06 jkoshy Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -25,8 +25,8 @@
 OPENSOLARIS_DISTDIR= ${OSNETDIR}/dist
 
 CTFOBJ!=       cd ${.CURDIR}/../libctf && ${PRINTOBJDIR}
-DWARFOBJ!=     cd ${.CURDIR}/../libdwarf && ${PRINTOBJDIR}
-ELFOBJ!=       cd ${.CURDIR}/../libelf && ${PRINTOBJDIR}
+DWARFOBJ!=     cd ${.CURDIR}/../elftoolchain/libdwarf && ${PRINTOBJDIR}
+ELFOBJ!=       cd ${.CURDIR}/../elftoolchain/libelf && ${PRINTOBJDIR}
 LDADD+=                -L${CTFOBJ} -lctf
 LDADD+=                -L${DWARFOBJ} -ldwarf
 LDADD+=                -L${ELFOBJ} -lelf