Module Name: src
Committed By: plunky
Date: Thu Jul 24 20:55:45 UTC 2014
Modified Files:
src/external/bsd/pcc/libexec: Makefile
src/external/bsd/pcc/usr.bin/pcc: Makefile
Log Message:
make p++ optional, on MKCXX
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pcc/libexec/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/pcc/usr.bin/pcc/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.7 src/external/bsd/pcc/libexec/Makefile:1.8
--- src/external/bsd/pcc/libexec/Makefile:1.7 Thu Jul 24 20:20:49 2014
+++ src/external/bsd/pcc/libexec/Makefile Thu Jul 24 20:55:45 2014
@@ -1,7 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2014/07/24 20:20:49 plunky Exp $
+# $NetBSD: Makefile,v 1.8 2014/07/24 20:55:45 plunky Exp $
.include <bsd.own.mk>
-SUBDIR= mkext .WAIT ccom cpp cxxcom
+SUBDIR= mkext .WAIT ccom cpp
+
+.if ${MKCXX} != "no"
+SUBDIR+= cxxcom
+.endif
.include <bsd.subdir.mk>
Index: src/external/bsd/pcc/usr.bin/pcc/Makefile
diff -u src/external/bsd/pcc/usr.bin/pcc/Makefile:1.9 src/external/bsd/pcc/usr.bin/pcc/Makefile:1.10
--- src/external/bsd/pcc/usr.bin/pcc/Makefile:1.9 Thu Jul 24 20:20:49 2014
+++ src/external/bsd/pcc/usr.bin/pcc/Makefile Thu Jul 24 20:55:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/07/24 20:20:49 plunky Exp $
+# $NetBSD: Makefile,v 1.10 2014/07/24 20:55:45 plunky Exp $
WARNS?= 2
@@ -29,6 +29,10 @@ pcc.1: cc.1
-e "s,Xr cpp,Xr pcpp," \
${.ALLSRC} > ${.TARGET}
+.if ${MKCXX} != "no"
+SYMLINKS+= ${BINDIR}/pcc /usr/bin/p++
+.endif
+
CLEANFILES+= pcc.1
.include <bsd.prog.mk>
