Source-Changes-HG archive

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

[src/trunk]: src/tools - Provide HOSTEXEEXT if NOCOMPATLIB



details:   https://anonhg.NetBSD.org/src/rev/4477908278e7
branches:  trunk
changeset: 784991:4477908278e7
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Feb 17 00:32:42 2013 +0000

description:
- Provide HOSTEXEEXT if NOCOMPATLIB
- merge a variable for readability and add an exe suffix where needed.

diffstat:

 tools/Makefile.host |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 41d881e8f174 -r 4477908278e7 tools/Makefile.host
--- a/tools/Makefile.host       Sat Feb 16 21:40:57 2013 +0000
+++ b/tools/Makefile.host       Sun Feb 17 00:32:42 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.host,v 1.29 2012/12/02 12:48:32 apb Exp $
+#      $NetBSD: Makefile.host,v 1.30 2013/02/17 00:32:42 christos Exp $
 
 NOINFO=                # defined
 NOLINT=                # defined
@@ -9,6 +9,8 @@
 .ifndef NOCOMPATLIB
 # Use TOOLDIR copy of libnbcompat and associated *.h files
 .-include      "${TOOLDIR}/share/compat/defs.mk"
+.elif !empty(.MAKE.OS:M*CYGWIN*)
+HOSTEXEEXT=.exe
 .endif
 
 # Resolve pathnames in variables.
@@ -43,6 +45,7 @@
 HOST_BINDIR?=  ${TOOLDIR}/bin
 HOST_CPPFLAGS:=        ${HOST_CPPFLAGS} ${CPPFLAGS}
 HOST_CPPFLAGS:=        ${HOST_CPPFLAGS:N-Wp,-iremap,*:N--sysroot=*}
+HOST_INSTALLPROG?=${HOST_BINDIR}/${HOSTPROGNAME}${HOSTEXEEXT}
 .undef LINKS
 
 SRCS?=         ${HOSTPROG}.c
@@ -52,14 +55,17 @@
 
 # Install rule.
 realinstall: install.host install.files
-install.host: ${HOST_BINDIR}/${HOSTPROGNAME}
-${HOST_BINDIR}/${HOSTPROGNAME}:: ${HOSTPROG}
+install.host: ${HOST_INSTALLPROG}
+${HOST_INSTALLPROG}:: ${HOSTPROG}
        ${_MKTARGET_INSTALL}
        mkdir -p ${HOST_BINDIR}
        ${HOST_INSTALL_FILE} -m ${BINMODE} ${HOSTPROG}${HOSTEXEEXT} ${.TARGET}
+.if !empty(.MAKE.OS:M*CYGWIN*)
+       ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${.TARGET}
+.endif
 
 .if ${MKUPDATE} == "no"
-.PHONY:                ${HOST_BINDIR}/${HOSTPROGNAME}
+.PHONY:                ${HOST_INSTALLPROG}
 .endif
 
 install.files:



Home | Main Index | Thread Index | Old Index