PERFORCE change 142862 for review
John Birrell
jb at FreeBSD.org
Wed Jun 4 03:17:02 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142862
Change 142862 by jb at freebsd3 on 2008/06/04 03:16:13
Update to match current/7.
Affected files ...
.. //depot/projects/dtrace6/src/share/mk/bsd.lib.mk#3 edit
.. //depot/projects/dtrace6/src/share/mk/bsd.libnames.mk#2 edit
.. //depot/projects/dtrace6/src/share/mk/bsd.prog.mk#3 edit
.. //depot/projects/dtrace6/src/share/mk/sys.mk#4 edit
Differences ...
==== //depot/projects/dtrace6/src/share/mk/bsd.lib.mk#3 (text+ko) ====
@@ -71,15 +71,9 @@
.cc.po .C.po .cpp.po .cxx.po:
${CXX} ${PO_FLAG} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
.cc.So .C.So .cpp.So .cxx.So:
${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
.f.po:
${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
==== //depot/projects/dtrace6/src/share/mk/bsd.libnames.mk#2 (text+ko) ====
@@ -33,13 +33,17 @@
LIBCOMPAT?= ${DESTDIR}${LIBDIR}/libcompat.a
LIBCRYPT?= ${DESTDIR}${LIBDIR}/libcrypt.a
LIBCRYPTO?= ${DESTDIR}${LIBDIR}/libcrypto.a
+LIBCTF?= ${DESTDIR}${LIBDIR}/libctf.a
LIBCURSES?= ${DESTDIR}${LIBDIR}/libcurses.a
LIBDEVINFO?= ${DESTDIR}${LIBDIR}/libdevinfo.a
LIBDEVSTAT?= ${DESTDIR}${LIBDIR}/libdevstat.a
LIBDIALOG?= ${DESTDIR}${LIBDIR}/libdialog.a
LIBDISK?= ${DESTDIR}${LIBDIR}/libdisk.a
LIBDNS?= ${DESTDIR}${LIBDIR}/libdns.a
+LIBDTRACE?= ${DESTDIR}${LIBDIR}/libdtrace.a
+LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.a
LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
+LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
LIBFL?= "don't use LIBFL, use LIBL"
LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
==== //depot/projects/dtrace6/src/share/mk/bsd.prog.mk#3 (text+ko) ====
@@ -12,6 +12,10 @@
.if defined(DEBUG_FLAGS)
CFLAGS+=${DEBUG_FLAGS}
+
+.if !defined(NO_CTF) && (${DEBUG_FLAGS:M-g} != "")
+CTFFLAGS+= -g
+.endif
.endif
.if defined(CRUNCH_CFLAGS)
==== //depot/projects/dtrace6/src/share/mk/sys.mk#4 (text+ko) ====
@@ -228,15 +228,9 @@
.cc .cpp .cxx .C:
${CXX} ${CXXFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
.cc.o .cpp.o .cxx.o .C.o:
${CXX} ${CXXFLAGS} -c ${.IMPSRC}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
.m.o:
${OBJC} ${OBJCFLAGS} -c ${.IMPSRC}
More information about the p4-projects
mailing list