Module Name: src
Committed By: plunky
Date: Thu Apr 14 09:31:25 UTC 2011
Modified Files:
src/external/bsd/pcc/libexec: Makefile
src/external/bsd/pcc/libexec/ccom: Makefile
Added Files:
src/external/bsd/pcc/libexec/mkext: Makefile
Log Message:
use HOSTPROG to build the mkext program (which creates external.c and
external.h for ccom) rather than HOST_CC directly.
because PROG and HOSTPROG don't play nicely together, put mkext in its
own SUBDIR
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/libexec/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pcc/libexec/ccom/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/pcc/libexec/mkext/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pcc/libexec/Makefile
diff -u src/external/bsd/pcc/libexec/Makefile:1.4 src/external/bsd/pcc/libexec/Makefile:1.5
--- src/external/bsd/pcc/libexec/Makefile:1.4 Fri Feb 5 08:42:39 2010
+++ src/external/bsd/pcc/libexec/Makefile Thu Apr 14 09:31:25 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/02/05 08:42:39 plunky Exp $
+# $NetBSD: Makefile,v 1.5 2011/04/14 09:31:25 plunky Exp $
.include <bsd.own.mk>
.if (${MKPCCCMDS} != "no")
-SUBDIR= ccom cpp
+SUBDIR= mkext .WAIT ccom cpp
.endif
.include <bsd.subdir.mk>
Index: src/external/bsd/pcc/libexec/ccom/Makefile
diff -u src/external/bsd/pcc/libexec/ccom/Makefile:1.6 src/external/bsd/pcc/libexec/ccom/Makefile:1.7
--- src/external/bsd/pcc/libexec/ccom/Makefile:1.6 Thu Jun 3 19:17:22 2010
+++ src/external/bsd/pcc/libexec/ccom/Makefile Thu Apr 14 09:31:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/06/03 19:17:22 plunky Exp $
+# $NetBSD: Makefile,v 1.7 2011/04/14 09:31:25 plunky Exp $
WARNS?= 2
@@ -31,10 +31,12 @@
DPSRCS= external.c external.h
-external.c external.h: mkext.c table.c common.c
- ${HOST_CC} ${CFLAGS} ${CPPFLAGS} -DMKEXT -o ${.OBJDIR}/mkext ${.ALLSRC}
- ${.OBJDIR}/mkext
+MKEXTDIR!= cd ../mkext && ${PRINTOBJDIR}
-CLEANFILES+= external.c external.h mkext
+external.c external.h: ${MKEXTDIR}/mkext
+ ${_MKTARGET_CREATE}
+ ${MKEXTDIR}/mkext
+
+CLEANFILES+= external.c external.h
.include <bsd.prog.mk>
Added files:
Index: src/external/bsd/pcc/libexec/mkext/Makefile
diff -u /dev/null src/external/bsd/pcc/libexec/mkext/Makefile:1.1
--- /dev/null Thu Apr 14 09:31:25 2011
+++ src/external/bsd/pcc/libexec/mkext/Makefile Thu Apr 14 09:31:25 2011
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2011/04/14 09:31:25 plunky Exp $
+
+#
+# this is really part of ccom, but HOSTPROG and PROG don't mix
+#
+
+.include <bsd.init.mk>
+
+.PATH: ${PCC_DIST}/cc/ccom \
+ ${PCC_DIST}/arch/${TARGMACH} \
+ ${PCC_DIST}/mip
+
+HOSTPROG= mkext
+MAN=
+SRCS= mkext.c table.c common.c
+
+HOST_CPPFLAGS+= -DMKEXT
+HOST_CPPFLAGS+= -I${PCC_DIST}/mip
+HOST_CPPFLAGS+= -I${PCC_DIST}/arch/${TARGMACH}
+HOST_CPPFLAGS+= -I${PCC_DIR}/include
+
+.include <bsd.hostprog.mk>
