[BACK]Return to bsd.lib.mk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / share / mk

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/share/mk/bsd.lib.mk between version 1.276 and 1.277

version 1.276, 2008/04/26 22:28:13 version 1.277, 2008/04/27 23:48:10
Line 441  _LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}$
Line 441  _LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}$
                 -L${DESTDIR}${SHLIBINSTALLDIR}                  -L${DESTDIR}${SHLIBINSTALLDIR}
 .endif  .endif
   
   # gcc -shared now adds -lc automatically. For libraries other than libc and
   # libgcc* we add as a dependency the installed shared libc. For libc and
   # libgcc* we avoid adding libc as a dependency by using -nostdlib. Note that
   # -Xl,-nostdlib is not enough because we want to tell the compiler-driver not
   # to add standard libraries, not the linker.
 .if !defined(LIB)  .if !defined(LIB)
 DPLIBC ?= ${DESTDIR}${LIBC_SO}  DPLIBC ?= ${DESTDIR}${LIBC_SO}
 LDLIBC ?= -lc  
 .else  .else
 .if ${LIB} != "c" && ${LIB:M*gcc*} == ""  .if ${LIB} != "c" && ${LIB:M*gcc*} == ""
 DPLIBC ?= ${DESTDIR}${LIBC_SO}  DPLIBC ?= ${DESTDIR}${LIBC_SO}
 LDLIBC ?= -lc  .else
   LDLIBC ?= -nostdlib
 .endif  .endif
 .endif  .endif
   
Line 456  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
Line 461  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
         rm -f lib${LIB}.so.${SHLIB_FULLVERSION}          rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
 .if defined(DESTDIR)  .if defined(DESTDIR)
         ${CC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \          ${CC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
             ${_LIBLDOPTS} \              ${_LIBLDOPTS} \
             -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \              -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \
             -Wl,--whole-archive ${SOLIB} \              -Wl,--whole-archive ${SOLIB} \
             -Wl,--no-whole-archive ${LDADD} \              -Wl,--no-whole-archive ${LDADD} \
             -L${_GCC_LIBGCCDIR} ${LDLIBC}              -L${_GCC_LIBGCCDIR}
 .else  .else
         ${CC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \          ${CC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} \
             ${_LIBLDOPTS} \              -o ${.TARGET} ${_LIBLDOPTS} \
             -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD} \              -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD}
             ${LDLIBC}  
 .endif  .endif
 .if ${OBJECT_FMT} == "ELF"  .if ${OBJECT_FMT} == "ELF"
 #  We don't use INSTALL_SYMLINK here because this is just  #  We don't use INSTALL_SYMLINK here because this is just
Legend:
Removed from v.1.276  
changed lines
  Added in v.1.277
CVSweb <webmaster@jp.NetBSD.org>