[src/trunk]: src/share/mk Move addition of -g to CSHLIBFLAGS later in bsd.lib...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/15d3b2490c2d
branches:  trunk
changeset: 786263:15d3b2490c2d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Apr 22 22:16:14 2013 +0000

description:
Move addition of -g to CSHLIBFLAGS later in bsd.lib.mk.

It is now past any conditionals where its emptiness or nonemptiness can
influence the decision of what objects get built.

Fixes MKDEBUG=yes build on vax (PR 47700).

diffstat:

 share/mk/bsd.lib.mk |  23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diffs (44 lines):

diff -r a6aa647fc72f -r 15d3b2490c2d share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Mon Apr 22 21:26:48 2013 +0000
+++ b/share/mk/bsd.lib.mk       Mon Apr 22 22:16:14 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.334 2013/04/11 01:27:47 christos Exp $
+#      $NetBSD: bsd.lib.mk,v 1.335 2013/04/22 22:16:14 riastradh Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -47,17 +47,6 @@
 AFLAGS+=        ${PIE_AFLAGS}
 .endif
 
-.if (defined(MKDEBUG) && (${MKDEBUG} != "no")) || \
-    (defined(CFLAGS) && !empty(CFLAGS:M*-g*))
-# 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"                             # {
 .for _lib _dir in ${LIBDPLIBS}
@@ -204,6 +193,16 @@
 MKSHLIBOBJS= no
 .endif
 
+.if (defined(MKDEBUG) && (${MKDEBUG} != "no")) || \
+    (defined(CFLAGS) && !empty(CFLAGS:M*-g*))
+# 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
+
 # Platform-independent linker flags for ELF shared libraries
 SHLIB_SOVERSION=       ${SHLIB_MAJOR}
 SHLIB_SHFLAGS=         -Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION}