[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.312 and 1.313

version 1.312, 2011/02/10 21:55:33 version 1.313, 2011/04/10 16:52:36
Line 63  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so
Line 63  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so
 ##### Build and install rules  ##### Build and install rules
 MKDEP_SUFFIXES?=        .o .po .pico .go .ln  MKDEP_SUFFIXES?=        .o .po .pico .go .ln
   
 # Use purely kernel private headers in rump builds  
 # Skip NetBSD headers for the toolchain builds  
 .if !defined(RUMPKERNEL) && !defined(HOSTLIB)  
 .if empty(CPPFLAGS:M-nostdinc)  
 CPPFLAGS+=      ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}  
 .endif  
 .if empty(CXXFLAGS:M-nostdinc++)  
 CXXFLAGS+=      ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}  
 .endif  
 .endif  
   
 .if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE})              # {  .if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE})              # {
 SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major  SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major
 SHLIB_MINOR != . ${SHLIB_VERSION_FILE} ; echo $$minor  SHLIB_MINOR != . ${SHLIB_VERSION_FILE} ; echo $$minor
Line 522  lib${LIB}_g.a:: ${GOBJS} __archivebuild
Line 511  lib${LIB}_g.a:: ${GOBJS} __archivebuild
   
 _LIBLDOPTS=  _LIBLDOPTS=
 .if ${SHLIBDIR} != "/usr/lib"  .if ${SHLIBDIR} != "/usr/lib"
 _LIBLDOPTS+=    -Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \  _LIBLDOPTS+=    -Wl,-rpath-link,=${SHLIBDIR} \
                 -Wl,-rpath,${SHLIBDIR} \                  -Wl,-rpath,=${SHLIBDIR} \
                 -L${DESTDIR}${SHLIBDIR}                  -L=${SHLIBDIR}
 .elif ${SHLIBINSTALLDIR} != "/usr/lib"  .elif ${SHLIBINSTALLDIR} != "/usr/lib"
 _LIBLDOPTS+=    -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \  _LIBLDOPTS+=    -Wl,-rpath-link,=${SHLIBINSTALLDIR} \
                 -L${DESTDIR}${SHLIBINSTALLDIR}                  -L=${SHLIBINSTALLDIR}
 .endif  .endif
   
 # gcc -shared now adds -lc automatically. For libraries other than libc and  # gcc -shared now adds -lc automatically. For libraries other than libc and
Line 565  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
Line 554  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}      ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
         rm -f lib${LIB}.so.${SHLIB_FULLVERSION}          rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
 .if defined(DESTDIR)  
         ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}${SHLIBDIR}/ \  
             -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \  
             -Wl,--whole-archive ${SOLIB} \  
             -Wl,--no-whole-archive ${_LDADD.lib${LIB}} \  
             ${_LIBLDOPTS} ${_LDFLAGS.lib${LIB}} \  
             -L${_GCC_LIBGCCDIR}  
 .else  
         ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${_LDFLAGS.lib${LIB}} \          ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${_LDFLAGS.lib${LIB}} \
             -o ${.TARGET} ${_LIBLDOPTS} \              -o ${.TARGET} ${_LIBLDOPTS} \
             -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${_LDADD.lib${LIB}}              -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${_LDADD.lib${LIB}}
 .endif  
 #  We don't use INSTALL_SYMLINK here because this is just  #  We don't use INSTALL_SYMLINK here because this is just
 #  happening inside the build directory/objdir. XXX Why does  #  happening inside the build directory/objdir. XXX Why does
 #  this spend so much effort on libraries that aren't live??? XXX  #  this spend so much effort on libraries that aren't live??? XXX

Legend:
Removed from v.1.312  
changed lines
  Added in v.1.313

CVSweb <webmaster@jp.NetBSD.org>