[src/trunk]: src/tools Better EXTERNAL_TOOLCHAIN support from Zachary McGrew

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

details:   https://anonhg.NetBSD.org/src/rev/c0129026e78a
branches:  trunk
changeset: 358398:c0129026e78a
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Dec 27 21:34:11 2017 +0000

description:
Better EXTERNAL_TOOLCHAIN support from Zachary McGrew
- Allow mdsetimage and dbsym to be built with EXTERNAL_TOOLCHAIN
- Allow BFDDIR and IBERTYDIR to be overwritten for mdsetimage and dbsym

diffstat:

 tools/Makefile            |  6 ++----
 tools/dbsym/Makefile      |  6 +++---
 tools/mdsetimage/Makefile |  6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diffs (60 lines):

diff -r 92fa063f77b8 -r c0129026e78a tools/Makefile
--- a/tools/Makefile    Wed Dec 27 20:27:02 2017 +0000
+++ b/tools/Makefile    Wed Dec 27 21:34:11 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.191 2017/06/07 10:38:33 skrll Exp $
+#      $NetBSD: Makefile,v 1.192 2017/12/27 21:34:11 christos Exp $
 
 .include <bsd.own.mk>
 .include <bsd.endian.mk>
@@ -53,9 +53,7 @@
 . endif
 .endif
 
-.if ${TOOLCHAIN_MISSING} == "no"
-# XXX Eventually, we want to be able to build dbsym and mdsetimage
-# XXX if EXTERNAL_TOOLCHAIN is set.
+.if ${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN)
 TOOLCHAIN_BITS+= dbsym mdsetimage
 .endif
 
diff -r 92fa063f77b8 -r c0129026e78a tools/dbsym/Makefile
--- a/tools/dbsym/Makefile      Wed Dec 27 20:27:02 2017 +0000
+++ b/tools/dbsym/Makefile      Wed Dec 27 21:34:11 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2017/01/06 20:27:19 christos Exp $
+#      $NetBSD: Makefile,v 1.12 2017/12/27 21:34:11 christos Exp $
 
 NOMAN= # defined
 
@@ -9,8 +9,8 @@
 HOST_SRCDIR=    external/gpl3/binutils/usr.sbin/dbsym
 
 TOOLCHAINOBJ!= cd ${.CURDIR}/../binutils && ${PRINTOBJDIR}
-BFDDIR=                ${TOOLCHAINOBJ}/build/bfd
-IBERTYDIR=     ${TOOLCHAINOBJ}/build/libiberty
+BFDDIR?=       ${TOOLCHAINOBJ}/build/bfd
+IBERTYDIR?=    ${TOOLCHAINOBJ}/build/libiberty
 
 .include "${.CURDIR}/../Makefile.host"
 
diff -r 92fa063f77b8 -r c0129026e78a tools/mdsetimage/Makefile
--- a/tools/mdsetimage/Makefile Wed Dec 27 20:27:02 2017 +0000
+++ b/tools/mdsetimage/Makefile Wed Dec 27 21:34:11 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2017/01/06 20:27:19 christos Exp $
+#      $NetBSD: Makefile,v 1.14 2017/12/27 21:34:12 christos Exp $
 
 NOMAN= # defined
 
@@ -9,8 +9,8 @@
 HOST_SRCDIR=   external/gpl3/binutils/usr.sbin/mdsetimage
 
 TOOLCHAINOBJ!= cd ${.CURDIR}/../binutils && ${PRINTOBJDIR}
-BFDDIR=                ${TOOLCHAINOBJ}/build/bfd
-IBERTYDIR=     ${TOOLCHAINOBJ}/build/libiberty
+BFDDIR?=       ${TOOLCHAINOBJ}/build/bfd
+IBERTYDIR?=    ${TOOLCHAINOBJ}/build/libiberty
 
 .include "${.CURDIR}/../Makefile.host"