Module Name: src
Committed By: christos
Date: Thu Apr 4 21:15:15 UTC 2013
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
fix mkdebug for private libraries.
while here, centralize the strip variable handling per type of object.
To generate a diff of this commit:
cvs rdiff -u -r1.332 -r1.333 src/share/mk/bsd.lib.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.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.332 src/share/mk/bsd.lib.mk:1.333
--- src/share/mk/bsd.lib.mk:1.332 Tue Mar 5 16:16:24 2013
+++ src/share/mk/bsd.lib.mk Thu Apr 4 17:15:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.332 2013/03/05 21:16:24 pooka Exp $
+# $NetBSD: bsd.lib.mk,v 1.333 2013/04/04 21:15:15 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -52,7 +52,11 @@ AFLAGS+= ${PIE_AFLAGS}
# We only add -g to the shared library objects
# because we don't currently split .a archives.
CSHLIBFLAGS+= -g
+.if ${LIBISPRIVATE} == "yes"
+CFLAGS+= -g
.endif
+.endif
+
##### Libraries that this may depend upon.
.if defined(LIBDPLIBS) && ${MKPIC} != "no" # {
@@ -218,13 +222,27 @@ CTFFLAGS+= -g
.endif
.endif
+LIBSTRIPAOBJS= yes
+.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+LIBSTRIPCOBJS= yes
+.endif
+.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+LIBSTRIPOBJCOBJS= yes
+.endif
+.if !defined(FFLAGS) || empty(FFLAGS:M*-g*)
+LIBSTRIPFOBJS= yes
+.endif
+.if !defined(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*)
+LIBSTRIPSHLIBOBJS= yes
+.endif
+
.c.o:
${_MKTARGET_COMPILE}
${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
.if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPCOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
@@ -234,7 +252,7 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPCOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
@@ -245,21 +263,21 @@ CTFFLAGS+= -g
.c.pico:
${_MKTARGET_COMPILE}
${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if !defined(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*)
+.if defined(LIBSTRIPSHLIBOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
.cc.o .cpp.o .cxx.o .C.o:
${_MKTARGET_COMPILE}
${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPCOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
.cc.po .cpp.po .cxx.po .C.po:
${_MKTARGET_COMPILE}
${COMPILE.cc} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPCOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
@@ -270,7 +288,7 @@ CTFFLAGS+= -g
.cc.pico .cpp.pico .cxx.pico .C.pico:
${_MKTARGET_COMPILE}
${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if !defined(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*)
+.if defined(LIBSTRIPSHLIBOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
@@ -280,7 +298,7 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif
-.if !defined(FOPTS) || empty(FOPTS:M*-g*)
+.if defined(LIBSTRIPFOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
@@ -290,7 +308,7 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif
-.if !defined(FOPTS) || empty(FOPTS:M*-g*)
+.if defined(LIBSTRIPFOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
@@ -301,7 +319,7 @@ CTFFLAGS+= -g
.f.pico:
${_MKTARGET_COMPILE}
${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if !defined(FOPTS) || empty(FOPTS:M*-g*)
+.if defined(LIBSTRIPFOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
@@ -315,7 +333,7 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJCOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
@@ -325,21 +343,21 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJCOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
.m.go:
${_MKTARGET_COMPILE}
${COMPILE.m} ${DEBUGFLAGS} -g ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJCOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
.m.pico:
${_MKTARGET_COMPILE}
${COMPILE.m} ${CSHLIBFLAGS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJCOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
@@ -349,7 +367,9 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif
+.if defined(LIBSTRIPAOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
.S.o:
${_MKTARGET_COMPILE}
@@ -357,7 +377,9 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif
+.if defined(LIBSTRIPAOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
.s.po:
${_MKTARGET_COMPILE}
@@ -365,7 +387,9 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif
+.if defined(LIBSTRIPAOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
.S.po:
${_MKTARGET_COMPILE}
@@ -373,7 +397,9 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif
+.if defined(LIBSTRIPAOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
.s.go:
${_MKTARGET_COMPILE}
@@ -386,12 +412,16 @@ CTFFLAGS+= -g
.s.pico:
${_MKTARGET_COMPILE}
${COMPILE.s} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(LIBSTRIPAOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
.S.pico:
${_MKTARGET_COMPILE}
${COMPILE.S} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(LIBSTRIPAOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
# Declare a few variables to make our life easier later.
_LIB:=${_LIB_PREFIX}${LIB}
@@ -441,7 +471,7 @@ OBJS+= ${_LIB}_combine.o
${_LIB}_combine.o: ${COMBINESRCS}
${_MKTARGET_COMPILE}
${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJS)
${OBJCOPY} -x ${.TARGET}
.endif
