Thu Apr 24 00:14:59 2014 UTC ()
allow use with linkers that don't support --warn-shared-textrel
(Solaris, OpenBSD)


(pooka)
diff -r1.353 -r1.354 src/share/mk/bsd.lib.mk
cvs diff -r1.353 -r1.354 src/share/mk/bsd.lib.mk (expand / switch to unified diff)

--- src/share/mk/bsd.lib.mk 2014/04/11 16:51:43 1.353
+++ src/share/mk/bsd.lib.mk 2014/04/24 00:14:59 1.354
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.lib.mk,v 1.353 2014/04/11 16:51:43 matt Exp $ 1# $NetBSD: bsd.lib.mk,v 1.354 2014/04/24 00:14:59 pooka Exp $
2# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 2# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
3 3
4.include <bsd.init.mk> 4.include <bsd.init.mk>
5.include <bsd.shlib.mk> 5.include <bsd.shlib.mk>
6.include <bsd.gcc.mk> 6.include <bsd.gcc.mk>
7# Pull in <bsd.sys.mk> here so we can override its .c.o rule 7# Pull in <bsd.sys.mk> here so we can override its .c.o rule
8.include <bsd.sys.mk> 8.include <bsd.sys.mk>
9 9
10LIBISMODULE?= no 10LIBISMODULE?= no
11LIBISPRIVATE?= no 11LIBISPRIVATE?= no
12LIBISCXX?= no 12LIBISCXX?= no
13 13
14.if ${LIBISMODULE} != "no" 14.if ${LIBISMODULE} != "no"
@@ -159,27 +159,29 @@ MKSHLIBOBJS= no @@ -159,27 +159,29 @@ MKSHLIBOBJS= no
159.if (defined(MKDEBUG) && (${MKDEBUG} != "no")) || \ 159.if (defined(MKDEBUG) && (${MKDEBUG} != "no")) || \
160 (defined(CFLAGS) && !empty(CFLAGS:M*-g*)) 160 (defined(CFLAGS) && !empty(CFLAGS:M*-g*))
161# We only add -g to the shared library objects 161# We only add -g to the shared library objects
162# because we don't currently split .a archives. 162# because we don't currently split .a archives.
163CSHLIBFLAGS+= -g 163CSHLIBFLAGS+= -g
164.if ${LIBISPRIVATE} == "yes" 164.if ${LIBISPRIVATE} == "yes"
165CFLAGS+= -g 165CFLAGS+= -g
166.endif 166.endif
167.endif 167.endif
168 168
169# Platform-independent linker flags for ELF shared libraries 169# Platform-independent linker flags for ELF shared libraries
170SHLIB_SOVERSION= ${SHLIB_MAJOR} 170SHLIB_SOVERSION= ${SHLIB_MAJOR}
171SHLIB_SHFLAGS= -Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION} 171SHLIB_SHFLAGS= -Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION}
 172.if !defined(SHLIB_WARNTEXTREL) || ${SHLIB_WARNTEXTREL} != "no"
172SHLIB_SHFLAGS+= -Wl,--warn-shared-textrel 173SHLIB_SHFLAGS+= -Wl,--warn-shared-textrel
 174.endif
173.if !defined(SHLIB_MKMAP) || ${SHLIB_MKMAP} != "no" 175.if !defined(SHLIB_MKMAP) || ${SHLIB_MKMAP} != "no"
174SHLIB_SHFLAGS+= -Wl,-Map=${_LIB}.so.${SHLIB_SOVERSION}.map 176SHLIB_SHFLAGS+= -Wl,-Map=${_LIB}.so.${SHLIB_SOVERSION}.map
175.endif 177.endif
176CLEANFILES+= ${_LIB}.so.${SHLIB_SOVERSION}.map 178CLEANFILES+= ${_LIB}.so.${SHLIB_SOVERSION}.map
177SHLIB_LDSTARTFILE?= ${_GCC_CRTI} ${_GCC_CRTBEGINS} 179SHLIB_LDSTARTFILE?= ${_GCC_CRTI} ${_GCC_CRTBEGINS}
178SHLIB_LDENDFILE?= ${_GCC_CRTENDS} ${_GCC_CRTN} 180SHLIB_LDENDFILE?= ${_GCC_CRTENDS} ${_GCC_CRTN}
179 181
180CFLAGS+= ${COPTS} 182CFLAGS+= ${COPTS}
181OBJCFLAGS+= ${OBJCOPTS} 183OBJCFLAGS+= ${OBJCOPTS}
182AFLAGS+= ${COPTS} 184AFLAGS+= ${COPTS}
183FFLAGS+= ${FOPTS} 185FFLAGS+= ${FOPTS}
184 186
185.if defined(CTFCONVERT) 187.if defined(CTFCONVERT)