[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.220 and 1.221

version 1.220, 2003/06/11 04:56:58 version 1.221, 2003/06/27 17:27:11
Line 152  MKSHLIBOBJS= no
Line 152  MKSHLIBOBJS= no
 # Platform-independent linker flags for ELF shared libraries  # Platform-independent linker flags for ELF shared libraries
 .if ${OBJECT_FMT} == "ELF"  .if ${OBJECT_FMT} == "ELF"
 SHLIB_SOVERSION=        ${SHLIB_MAJOR}  SHLIB_SOVERSION=        ${SHLIB_MAJOR}
 SHLIB_SHFLAGS=          -soname lib${LIB}.so.${SHLIB_SOVERSION}  SHLIB_SHFLAGS=          -Wl,-soname,lib${LIB}.so.${SHLIB_SOVERSION}
 SHLIB_LDSTARTFILE?=     ${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGINS}  SHLIB_LDSTARTFILE?=     ${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGINS}
 SHLIB_LDENDFILE?=       ${_GCC_CRTENDS} ${DESTDIR}/usr/lib/crtn.o  SHLIB_LDENDFILE?=       ${_GCC_CRTENDS} ${DESTDIR}/usr/lib/crtn.o
 .endif  .endif
Line 392  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
Line 392  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
         @echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\)          @echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\)
         @rm -f lib${LIB}.so.${SHLIB_FULLVERSION}          @rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
 .if defined(DESTDIR)  .if defined(DESTDIR)
         $(LD) -nostdlib -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \          $(CC) -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
             ${SHLIB_LDSTARTFILE} \              -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
             --whole-archive ${SOLIB} \              -Wl,--whole-archive ${SOLIB} \
             --no-whole-archive ${LDADD} \              -Wl,--no-whole-archive ${LDADD} \
             -L${DESTDIR}${_LIBSODIR} -L${DESTDIR}${LIBDIR} \              -L${_GCC_LIBGCCDIR} -L${DESTDIR}${_LIBSODIR} -L${DESTDIR}${LIBDIR} \
             -R${_LIBSODIR} -R${LIBDIR} \              -R${_LIBSODIR} -R${LIBDIR}
             ${SHLIB_LDENDFILE}  .else
 .else          $(CC) -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
         $(LD) -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \              -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD}
             ${SHLIB_LDSTARTFILE} \  
             --whole-archive ${SOLIB} --no-whole-archive ${LDADD} \  
             ${SHLIB_LDENDFILE}  
 .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.220  
changed lines
  Added in v.1.221

CVSweb <webmaster@jp.NetBSD.org>