Module Name: src
Committed By: riastradh
Date: Mon Apr 22 22:16:15 UTC 2013
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.334 -r1.335 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.334 src/share/mk/bsd.lib.mk:1.335
--- src/share/mk/bsd.lib.mk:1.334 Thu Apr 11 01:27:47 2013
+++ src/share/mk/bsd.lib.mk Mon Apr 22 22:16:14 2013
@@ -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 @@ CFLAGS+= ${PIE_CFLAGS}
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= yes
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}
