Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make all shared libraries depend on libc.

Browse Source
This commit is contained in:
christos 2008-04-26 20:03:44 +00:00
parent 6e8524778b
commit 9d8a22cf84
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
share/mk/bsd.hostprog.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.hostprog.mk,v 1.50 2006/11/09 17:06:54 christos Exp $
# $NetBSD: bsd.hostprog.mk,v 1.51 2008/04/26 20:03:44 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.include <bsd.init.mk>
@ -12,6 +12,7 @@ LIBBLUETOOTH?= /usr/lib/libbluetooth.a
LIBBZ2?= /usr/lib/libbz2.a
LIBC?= /usr/lib/libc.a
LIBC_PIC?= /usr/lib/libc_pic.a
LIBC_SO?= /usr/lib/libc.so
LIBCOMPAT?= /usr/lib/libcompat.a
LIBCRYPT?= /usr/lib/libcrypt.a
LIBCURSES?= /usr/lib/libcurses.a

14
share/mk/bsd.lib.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.lib.mk,v 1.273 2008/01/09 11:26:14 simonb Exp $
# $NetBSD: bsd.lib.mk,v 1.274 2008/04/26 20:03:44 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@ -441,7 +441,12 @@ _LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \
-L${DESTDIR}${SHLIBINSTALLDIR}
.endif
lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \
.if ${LIB} != "c"
DPLIBC ?= ${DESTDIR}${LIBC_SO}
LDLIBC ?= -lc
.endif
lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} ${DPLIBC} \
${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
${_MKTARGET_BUILD}
rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
@ -451,11 +456,12 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \
-Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \
-Wl,--whole-archive ${SOLIB} \
-Wl,--no-whole-archive ${LDADD} \
-L${_GCC_LIBGCCDIR}
-L${_GCC_LIBGCCDIR} ${LDLIBC}
.else
${CC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \
${_LIBLDOPTS} \
-Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD}
-Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD} \
${LDLIBC}
.endif
.if ${OBJECT_FMT} == "ELF"
# We don't use INSTALL_SYMLINK here because this is just