| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: bsd.lib.mk,v 1.293 2009/01/08 20:03:59 pooka Exp $ | | 1 | # $NetBSD: bsd.lib.mk,v 1.294 2009/01/17 12:07:59 he 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 | |
10 | LIBISMODULE?= no | | 10 | LIBISMODULE?= no |
11 | LIBISPRIVATE?= no | | 11 | LIBISPRIVATE?= no |
12 | LIBISCXX?= no | | 12 | LIBISCXX?= no |
13 | | | 13 | |
14 | _LIB_PREFIX= lib | | 14 | _LIB_PREFIX= lib |
| @@ -501,30 +501,30 @@ LDADD+= -lgcc_pic | | | @@ -501,30 +501,30 @@ LDADD+= -lgcc_pic |
501 | | | 501 | |
502 | .if ${LIBISCXX} != "no" | | 502 | .if ${LIBISCXX} != "no" |
503 | LIBCC:= ${CXX} | | 503 | LIBCC:= ${CXX} |
504 | .else | | 504 | .else |
505 | LIBCC:= ${CC} | | 505 | LIBCC:= ${CC} |
506 | .endif | | 506 | .endif |
507 | | | 507 | |
508 | lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} ${DPLIBC} \ | | 508 | lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} ${DPLIBC} \ |
509 | ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE} | | 509 | ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE} |
510 | ${_MKTARGET_BUILD} | | 510 | ${_MKTARGET_BUILD} |
511 | rm -f lib${LIB}.so.${SHLIB_FULLVERSION} | | 511 | rm -f lib${LIB}.so.${SHLIB_FULLVERSION} |
512 | .if defined(DESTDIR) | | 512 | .if defined(DESTDIR) |
513 | ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \ | | 513 | ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \ |
514 | ${_LIBLDOPTS} \ | | 514 | -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ |
515 | -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \ | | | |
516 | -Wl,--whole-archive ${SOLIB} \ | | 515 | -Wl,--whole-archive ${SOLIB} \ |
517 | -Wl,--no-whole-archive ${LDADD} \ | | 516 | -Wl,--no-whole-archive ${LDADD} \ |
| | | 517 | ${_LIBLDOPTS} ${LDFLAGS} \ |
518 | -L${_GCC_LIBGCCDIR} | | 518 | -L${_GCC_LIBGCCDIR} |
519 | .else | | 519 | .else |
520 | ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} \ | | 520 | ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} \ |
521 | -o ${.TARGET} ${_LIBLDOPTS} \ | | 521 | -o ${.TARGET} ${_LIBLDOPTS} \ |
522 | -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD} | | 522 | -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD} |
523 | .endif | | 523 | .endif |
524 | .if ${OBJECT_FMT} == "ELF" | | 524 | .if ${OBJECT_FMT} == "ELF" |
525 | # We don't use INSTALL_SYMLINK here because this is just | | 525 | # We don't use INSTALL_SYMLINK here because this is just |
526 | # happening inside the build directory/objdir. XXX Why does | | 526 | # happening inside the build directory/objdir. XXX Why does |
527 | # this spend so much effort on libraries that aren't live??? XXX | | 527 | # this spend so much effort on libraries that aren't live??? XXX |
528 | .if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \ | | 528 | .if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \ |
529 | "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}" | | 529 | "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}" |
530 | ${HOST_LN} -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.${SHLIB_MAJOR}.tmp | | 530 | ${HOST_LN} -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.${SHLIB_MAJOR}.tmp |