Module Name: src
Committed By: joerg
Date: Tue Oct 29 16:11:46 UTC 2013
Modified Files:
src/share/mk: bsd.hostlib.mk bsd.hostprog.mk bsd.own.mk
Log Message:
Unbreak src/tools usage of C++.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/share/mk/bsd.hostlib.mk
cvs rdiff -u -r1.71 -r1.72 src/share/mk/bsd.hostprog.mk
cvs rdiff -u -r1.754 -r1.755 src/share/mk/bsd.own.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.hostlib.mk
diff -u src/share/mk/bsd.hostlib.mk:1.16 src/share/mk/bsd.hostlib.mk:1.17
--- src/share/mk/bsd.hostlib.mk:1.16 Sat Sep 10 16:57:35 2011
+++ src/share/mk/bsd.hostlib.mk Tue Oct 29 16:11:46 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostlib.mk,v 1.16 2011/09/10 16:57:35 apb Exp $
+# $NetBSD: bsd.hostlib.mk,v 1.17 2013/10/29 16:11:46 joerg Exp $
.include <bsd.init.mk>
.include <bsd.sys.mk>
@@ -8,10 +8,12 @@
##### Default values
CFLAGS+= ${COPTS}
HOST_MKDEP?= CC=${HOST_CC:Q} mkdep
+HOST_MKDEPCXX?= CC=${HOST_CXX:Q} mkdep
MKDEP_SUFFIXES?= .o .lo
# Override these:
MKDEP:= ${HOST_MKDEP}
+MKDEPCXX:= ${HOST_MKDEPCXX}
.if ${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN)
OBJHOSTMACHINE= # set
Index: src/share/mk/bsd.hostprog.mk
diff -u src/share/mk/bsd.hostprog.mk:1.71 src/share/mk/bsd.hostprog.mk:1.72
--- src/share/mk/bsd.hostprog.mk:1.71 Fri Jun 14 16:10:02 2013
+++ src/share/mk/bsd.hostprog.mk Tue Oct 29 16:11:46 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostprog.mk,v 1.71 2013/06/14 16:10:02 tsutsui Exp $
+# $NetBSD: bsd.hostprog.mk,v 1.72 2013/10/29 16:11:46 joerg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.include <bsd.init.mk>
@@ -82,11 +82,13 @@ LIBRUMPFS_UDF?= /usr/lib/librumpfs_udf.
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:
INSTALL:= ${INSTALL:NSTRIP=*}
MKDEP:= ${HOST_MKDEP}
+MKDEPCXX:= ${HOST_MKDEPCXX}
.if ${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN)
OBJHOSTMACHINE= # set
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.754 src/share/mk/bsd.own.mk:1.755
--- src/share/mk/bsd.own.mk:1.754 Mon Oct 28 01:47:13 2013
+++ src/share/mk/bsd.own.mk Tue Oct 29 16:11:46 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.754 2013/10/28 01:47:13 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.755 2013/10/29 16:11:46 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -262,6 +262,7 @@ LDFLAGS+= --sysroot=/
.endif # EXTERNAL_TOOLCHAIN # }
HOST_MKDEP= ${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep
+HOST_MKDEPCXX= ${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep
DBSYM= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-dbsym
ELF2AOUT= ${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout
