Module Name: src
Committed By: christos
Date: Wed Dec 27 21:34:12 UTC 2017
Modified Files:
src/tools: Makefile
src/tools/dbsym: Makefile
src/tools/mdsetimage: Makefile
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/tools/Makefile
cvs rdiff -u -r1.11 -r1.12 src/tools/dbsym/Makefile
cvs rdiff -u -r1.13 -r1.14 src/tools/mdsetimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.191 src/tools/Makefile:1.192
--- src/tools/Makefile:1.191 Wed Jun 7 06:38:33 2017
+++ src/tools/Makefile Wed Dec 27 16:34:11 2017
@@ -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 @@ TOOLCHAIN_BITS+= pcc
. 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
Index: src/tools/dbsym/Makefile
diff -u src/tools/dbsym/Makefile:1.11 src/tools/dbsym/Makefile:1.12
--- src/tools/dbsym/Makefile:1.11 Fri Jan 6 15:27:19 2017
+++ src/tools/dbsym/Makefile Wed Dec 27 16:34:11 2017
@@ -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 @@ HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-db
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"
Index: src/tools/mdsetimage/Makefile
diff -u src/tools/mdsetimage/Makefile:1.13 src/tools/mdsetimage/Makefile:1.14
--- src/tools/mdsetimage/Makefile:1.13 Fri Jan 6 15:27:19 2017
+++ src/tools/mdsetimage/Makefile Wed Dec 27 16:34:12 2017
@@ -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 @@ HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-md
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"
