Module Name: src
Committed By: christos
Date: Wed Apr 9 19:23:09 UTC 2014
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Since the objcopy -x removes debugging symbols, delay that if we are building
debugging libraries and do the stripping with the debug symbol separation
step.
To generate a diff of this commit:
cvs rdiff -u -r1.350 -r1.351 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.350 src/share/mk/bsd.lib.mk:1.351
--- src/share/mk/bsd.lib.mk:1.350 Wed Apr 9 12:29:08 2014
+++ src/share/mk/bsd.lib.mk Wed Apr 9 15:23:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.350 2014/04/09 16:29:08 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.351 2014/04/09 19:23:09 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -622,7 +622,9 @@ ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL
${_LDFLAGS.${_LIB}} -o ${.TARGET} ${_LIBLDOPTS} \
-Wl,--whole-archive ${SOLIB} \
-Wl,--no-whole-archive ${_LDADD.${_LIB}}
+.if !defined(_LIB.so.debug)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
# We don't use INSTALL_SYMLINK here because this is just
# happening inside the build directory/objdir. XXX Why does
# this spend so much effort on libraries that aren't live??? XXX
@@ -641,7 +643,7 @@ ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL
${_LIB.so.debug}: ${_LIB.so.full}
${_MKTARGET_CREATE}
( ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \
- && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
+ && ${OBJCOPY} ${OBJCOPYLIBFLAGS} --strip-debug -p -R .gnu_debuglink \
--add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \
) || (rm -f ${.TARGET}; false)
.endif
