Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

the value of HOST_MKDEP previously depended on USETOOLS;

Browse Source 
make it do so again, and centralise the USETOOLS=no case
into bsd.host.mk
This commit is contained in:
plunky 2014-04-10 19:02:18 +00:00
parent 7a138543c8
commit daae7d153c
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
share/mk/bsd.host.mk
View File

@ -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_OSREL:C/\([^\)]*\)//g:[*]:C/ /_/g}-${_HOST
.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}

4
share/mk/bsd.hostlib.mk
View File

@ -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:

4
share/mk/bsd.hostprog.mk
View File

@ -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_tmpfs.a
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: