Module Name: src
Committed By: tsutsui
Date: Fri Jun 14 16:10:02 UTC 2013
Modified Files:
src/share/mk: bsd.hostprog.mk
src/tools: Makefile.host
src/tools/texinfo: Makefile
Log Message:
Invoke tools/binstall/mkmanifest for Cygwin via ${HOST_SH}.
Fixes builds using source sets that drop executable bits.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/share/mk/bsd.hostprog.mk
cvs rdiff -u -r1.30 -r1.31 src/tools/Makefile.host
cvs rdiff -u -r1.10 -r1.11 src/tools/texinfo/Makefile
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.hostprog.mk
diff -u src/share/mk/bsd.hostprog.mk:1.70 src/share/mk/bsd.hostprog.mk:1.71
--- src/share/mk/bsd.hostprog.mk:1.70 Thu Apr 11 01:27:47 2013
+++ src/share/mk/bsd.hostprog.mk Fri Jun 14 16:10:02 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostprog.mk,v 1.70 2013/04/11 01:27:47 christos Exp $
+# $NetBSD: bsd.hostprog.mk,v 1.71 2013/06/14 16:10:02 tsutsui Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.include <bsd.init.mk>
@@ -117,7 +117,7 @@ ${HOSTPROG}: ${OBJS} ${DPADD}
${_MKTARGET_LINK}
${HOST_LINK.c} ${HOST_LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD}
.if !empty(.MAKE.OS:M*CYGWIN*)
- ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${HOSTPROG}
+ ${HOST_SH} ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${HOSTPROG}
.endif
Index: src/tools/Makefile.host
diff -u src/tools/Makefile.host:1.30 src/tools/Makefile.host:1.31
--- src/tools/Makefile.host:1.30 Sun Feb 17 00:32:42 2013
+++ src/tools/Makefile.host Fri Jun 14 16:10:02 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.host,v 1.30 2013/02/17 00:32:42 christos Exp $
+# $NetBSD: Makefile.host,v 1.31 2013/06/14 16:10:02 tsutsui Exp $
NOINFO= # defined
NOLINT= # defined
@@ -61,7 +61,7 @@ ${HOST_INSTALLPROG}:: ${HOSTPROG}
mkdir -p ${HOST_BINDIR}
${HOST_INSTALL_FILE} -m ${BINMODE} ${HOSTPROG}${HOSTEXEEXT} ${.TARGET}
.if !empty(.MAKE.OS:M*CYGWIN*)
- ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${.TARGET}
+ ${HOST_SH} ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${.TARGET}
.endif
.if ${MKUPDATE} == "no"
Index: src/tools/texinfo/Makefile
diff -u src/tools/texinfo/Makefile:1.10 src/tools/texinfo/Makefile:1.11
--- src/tools/texinfo/Makefile:1.10 Sun Feb 17 01:47:59 2013
+++ src/tools/texinfo/Makefile Fri Jun 14 16:10:02 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/02/17 01:47:59 christos Exp $
+# $NetBSD: Makefile,v 1.11 2013/06/14 16:10:02 tsutsui Exp $
MODULE= texinfo
@@ -9,5 +9,5 @@ CONFIGURE_ARGS= --program-prefix=${_TOOL
.if !empty(.MAKE.OS:M*CYGWIN*) && target(install)
.END: install-texinfo
install-texinfo:
- ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${TOOLDIR}/bin/${_TOOL_PREFIX}install-info.exe
+ ${HOST_SH} ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${TOOLDIR}/bin/${_TOOL_PREFIX}install-info.exe
.endif
