Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk the value of HOST_MKDEP previously depended on USET...



details:   https://anonhg.NetBSD.org/src/rev/1ff88976010c
branches:  trunk
changeset: 328626:1ff88976010c
user:      plunky <plunky%NetBSD.org@localhost>
date:      Thu Apr 10 19:02:18 2014 +0000

description:
the value of HOST_MKDEP previously depended on USETOOLS;
make it do so again, and centralise the USETOOLS=no case
into bsd.host.mk

diffstat:

 share/mk/bsd.host.mk     |  7 ++++++-
 share/mk/bsd.hostlib.mk  |  4 +---
 share/mk/bsd.hostprog.mk |  4 +---
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r add6aea0784a -r 1ff88976010c share/mk/bsd.host.mk
--- a/share/mk/bsd.host.mk      Thu Apr 10 18:10:09 2014 +0000
+++ b/share/mk/bsd.host.mk      Thu Apr 10 19:02:18 2014 +0000
@@ -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 @@
 .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}
diff -r add6aea0784a -r 1ff88976010c share/mk/bsd.hostlib.mk
--- a/share/mk/bsd.hostlib.mk   Thu Apr 10 18:10:09 2014 +0000
+++ b/share/mk/bsd.hostlib.mk   Thu Apr 10 19:02:18 2014 +0000
@@ -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:
diff -r add6aea0784a -r 1ff88976010c share/mk/bsd.hostprog.mk
--- a/share/mk/bsd.hostprog.mk  Thu Apr 10 18:10:09 2014 +0000
+++ b/share/mk/bsd.hostprog.mk  Thu Apr 10 19:02:18 2014 +0000
@@ -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_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:



Home | Main Index | Thread Index | Old Index