Module Name: src
Committed By: christos
Date: Sat Jan 26 21:49:20 UTC 2013
Modified Files:
src/share/mk: bsd.prog.mk bsd.sys.mk sys.mk
Log Message:
CTFCONVERT me harder.
To generate a diff of this commit:
cvs rdiff -u -r1.279 -r1.280 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.220 -r1.221 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.113 -r1.114 src/share/mk/sys.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.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.279 src/share/mk/bsd.prog.mk:1.280
--- src/share/mk/bsd.prog.mk:1.279 Thu Jan 17 10:42:59 2013
+++ src/share/mk/bsd.prog.mk Sat Jan 26 16:49:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.279 2013/01/17 15:42:59 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.280 2013/01/26 21:49:20 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -33,12 +33,18 @@ CLEANFILES+=strings
.c.o:
${CC} -E ${CPPFLAGS} ${CFLAGS} ${.IMPSRC} | xstr -c -
@${CC} ${CPPFLAGS} ${CFLAGS} -c x.c -o ${.TARGET}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
@rm -f x.c
.cc.o .cpp.o .cxx.o .C.o:
${CXX} -E ${CPPFLAGS} ${CXXFLAGS} ${.IMPSRC} | xstr -c -
@mv -f x.c x.cc
@${CXX} ${CPPFLAGS} ${CXXFLAGS} -c x.cc -o ${.TARGET}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
@rm -f x.cc
.endif
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.220 src/share/mk/bsd.sys.mk:1.221
--- src/share/mk/bsd.sys.mk:1.220 Sun Sep 23 15:20:44 2012
+++ src/share/mk/bsd.sys.mk Sat Jan 26 16:49:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.220 2012/09/23 19:20:44 joerg Exp $
+# $NetBSD: bsd.sys.mk,v 1.221 2013/01/26 21:49:20 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -212,6 +212,9 @@ STRIP?= strip
.cc.o .cpp.o .cxx.o .C.o:
${_MKTARGET_COMPILE}
${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
# Objective C
# (Defined here rather than in <sys.mk> because `.m' is not just
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.113 src/share/mk/sys.mk:1.114
--- src/share/mk/sys.mk:1.113 Fri Jan 18 14:32:09 2013
+++ src/share/mk/sys.mk Sat Jan 26 16:49:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.113 2013/01/18 19:32:09 christos Exp $
+# $NetBSD: sys.mk,v 1.114 2013/01/26 21:49:20 christos Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
#
# This file contains the basic rules for make(1) and is read first
@@ -135,6 +135,9 @@ YACC.y?= ${YACC} ${YFLAGS}
${LINK.cc} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
.cc.o .cpp.o .cxx.o .C.o:
${COMPILE.cc} ${.IMPSRC}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.cc.a .cpp.a .cxx.a .C.a:
${COMPILE.cc} ${.IMPSRC}
${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
@@ -145,6 +148,9 @@ YACC.y?= ${YACC} ${YFLAGS}
${LINK.f} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
.f.o:
${COMPILE.f} ${.IMPSRC}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.f.a:
${COMPILE.f} ${.IMPSRC}
${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
@@ -169,6 +175,9 @@ YACC.y?= ${YACC} ${YFLAGS}
${LINK.r} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
.r.o:
${COMPILE.r} ${.IMPSRC}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.r.a:
${COMPILE.r} ${.IMPSRC}
${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
@@ -231,6 +240,9 @@ YACC.y?= ${YACC} ${YFLAGS}
.l.o:
${LEX.l} ${.IMPSRC}
${COMPILE.c} -o ${.TARGET} lex.yy.c
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
rm -f lex.yy.c
# Yacc
@@ -244,6 +256,9 @@ YACC.y?= ${YACC} ${YFLAGS}
.y.o:
${YACC.y} ${.IMPSRC}
${COMPILE.c} -o ${.TARGET} y.tab.c
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
rm -f y.tab.c
# Shell
