[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.299 and 1.300

version 1.299, 2009/11/27 11:44:36 version 1.300, 2009/12/08 15:18:42
Line 47  clean:  cleanlib
Line 47  clean:  cleanlib
 CFLAGS+=        ${PIE_CFLAGS}  CFLAGS+=        ${PIE_CFLAGS}
 AFLAGS+=        ${PIE_AFLAGS}  AFLAGS+=        ${PIE_AFLAGS}
 .endif  .endif
 COPTS+=     ${COPTS.lib${LIB}}  
 CPPFLAGS+=  ${CPPFLAGS.lib${LIB}}  
 CXXFLAGS+=  ${CXXFLAGS.lib${LIB}}  
 OBJCOPTS+=  ${OBJCOPTS.lib${LIB}}  
 LDADD+=     ${LDADD.lib${LIB}}  
 LDFLAGS+=   ${LDFLAGS.lib${LIB}}  
 LDSTATIC+=  ${LDSTATIC.lib${LIB}}  
   
 ##### Libraries that this may depend upon.  ##### Libraries that this may depend upon.
 .if defined(LIBDPLIBS) && ${MKPIC} != "no"                              # {  .if defined(LIBDPLIBS) && ${MKPIC} != "no"                              # {
Line 522  LIBCC:= ${CXX}
Line 515  LIBCC:= ${CXX}
 LIBCC:= ${CC}  LIBCC:= ${CC}
 .endif  .endif
   
   _LDADD.lib${LIB}=       ${LDADD} ${LDADD.lib${LIB}}
   _LDFLAGS.lib${LIB}=     ${LDFLAGS} ${LDFLAGS.lib${LIB}}
   
 lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} ${DPLIBC} \  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} ${DPLIBC} \
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}      ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
Line 530  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
Line 526  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
         ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \          ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
             -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \              -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
             -Wl,--whole-archive ${SOLIB} \              -Wl,--whole-archive ${SOLIB} \
             -Wl,--no-whole-archive ${LDADD} \              -Wl,--no-whole-archive ${_LDADD.lib${LIB}} \
             ${_LIBLDOPTS} ${LDFLAGS} \              ${_LIBLDOPTS} ${_LDFLAGS.lib${LIB}} \
             -L${_GCC_LIBGCCDIR}              -L${_GCC_LIBGCCDIR}
 .else  .else
         ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} \          ${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}              -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${_LDADD.lib${LIB}}
 .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.299  
changed lines
  Added in v.1.300

CVSweb <webmaster@jp.NetBSD.org>