Module Name: src
Committed By: plunky
Date: Thu Apr 10 19:02:18 UTC 2014
Modified Files:
src/share/mk: bsd.host.mk bsd.hostlib.mk bsd.hostprog.mk
Log Message:
the value of HOST_MKDEP previously depended on USETOOLS;
make it do so again, and centralise the USETOOLS=no case
into bsd.host.mk
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/mk/bsd.host.mk
cvs rdiff -u -r1.17 -r1.18 src/share/mk/bsd.hostlib.mk
cvs rdiff -u -r1.72 -r1.73 src/share/mk/bsd.hostprog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.host.mk
diff -u src/share/mk/bsd.host.mk:1.1 src/share/mk/bsd.host.mk:1.2
--- src/share/mk/bsd.host.mk:1.1 Thu Jan 16 01:19:46 2014
+++ src/share/mk/bsd.host.mk Thu Apr 10 19:02:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.host.mk,v 1.1 2014/01/16 01:19:46 christos Exp $
+# $NetBSD: bsd.host.mk,v 1.2 2014/04/10 19:02:18 plunky Exp $
.if !defined(_BSD_HOST_MK_)
_BSD_HOST_MK_=1
@@ -46,8 +46,13 @@ HOST_OSTYPE:= ${_HOST_OSNAME}-${_HOST_OS
.MAKEOVERRIDES+= HOST_OSTYPE
.endif # !defined(HOST_OSTYPE)
+.if ${USETOOLS} == "yes"
HOST_MKDEP?= ${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep
HOST_MKDEPCXX?= ${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep
+.else
+HOST_MKDEP?= CC=${HOST_CC:Q} mkdep
+HOST_MKDEPCXX?= CC=${HOST_CXX:Q} mkdep
+.endif
.if ${NEED_OWN_INSTALL_TARGET} != "no"
HOST_INSTALL_FILE?= ${INSTALL} ${COPY} ${PRESERVE} ${RENAME}
Index: src/share/mk/bsd.hostlib.mk
diff -u src/share/mk/bsd.hostlib.mk:1.17 src/share/mk/bsd.hostlib.mk:1.18
--- src/share/mk/bsd.hostlib.mk:1.17 Tue Oct 29 16:11:46 2013
+++ src/share/mk/bsd.hostlib.mk Thu Apr 10 19:02:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostlib.mk,v 1.17 2013/10/29 16:11:46 joerg Exp $
+# $NetBSD: bsd.hostlib.mk,v 1.18 2014/04/10 19:02:18 plunky Exp $
.include <bsd.init.mk>
.include <bsd.sys.mk>
@@ -7,8 +7,6 @@
##### Default values
CFLAGS+= ${COPTS}
-HOST_MKDEP?= CC=${HOST_CC:Q} mkdep
-HOST_MKDEPCXX?= CC=${HOST_CXX:Q} mkdep
MKDEP_SUFFIXES?= .o .lo
# Override these:
Index: src/share/mk/bsd.hostprog.mk
diff -u src/share/mk/bsd.hostprog.mk:1.72 src/share/mk/bsd.hostprog.mk:1.73
--- src/share/mk/bsd.hostprog.mk:1.72 Tue Oct 29 16:11:46 2013
+++ src/share/mk/bsd.hostprog.mk Thu Apr 10 19:02:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostprog.mk,v 1.72 2013/10/29 16:11:46 joerg Exp $
+# $NetBSD: bsd.hostprog.mk,v 1.73 2014/04/10 19:02:18 plunky Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.include <bsd.init.mk>
@@ -81,8 +81,6 @@ LIBRUMPFS_TMPFS?= /usr/lib/librumpfs_tmp
LIBRUMPFS_UDF?= /usr/lib/librumpfs_udf.a
LIBRUMPFS_UFS?= /usr/lib/librumpfs_ufs.a
-HOST_MKDEP?= CC=${HOST_CC:Q} mkdep
-HOST_MKDEPCXX?= CC=${HOST_CXX:Q} mkdep
MKDEP_SUFFIXES?= .lo .ln
# Override these:
