[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.349 and 1.349.2.1

version 1.349, 2014/04/04 05:10:15 version 1.349.2.1, 2014/08/10 06:53:30
Line 169  CFLAGS+= -g
Line 169  CFLAGS+= -g
 # Platform-independent linker flags for ELF shared libraries  # Platform-independent linker flags for ELF shared libraries
 SHLIB_SOVERSION=        ${SHLIB_MAJOR}  SHLIB_SOVERSION=        ${SHLIB_MAJOR}
 SHLIB_SHFLAGS=          -Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION}  SHLIB_SHFLAGS=          -Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION}
   .if !defined(SHLIB_WARNTEXTREL) || ${SHLIB_WARNTEXTREL} != "no"
 SHLIB_SHFLAGS+=         -Wl,--warn-shared-textrel  SHLIB_SHFLAGS+=         -Wl,--warn-shared-textrel
   .endif
 .if !defined(SHLIB_MKMAP) || ${SHLIB_MKMAP} != "no"  .if !defined(SHLIB_MKMAP) || ${SHLIB_MKMAP} != "no"
 SHLIB_SHFLAGS+=         -Wl,-Map=${_LIB}.so.${SHLIB_SOVERSION}.map  SHLIB_SHFLAGS+=         -Wl,-Map=${_LIB}.so.${SHLIB_SOVERSION}.map
 .endif  .endif
Line 602  LDADD+= -lgcc
Line 604  LDADD+= -lgcc
 LIBCC:= ${CXX}  LIBCC:= ${CXX}
 . if ${MKLIBCXX} == "yes"  . if ${MKLIBCXX} == "yes"
 LIBDPLIBS+=     c++     ${.CURDIR}/../../../../../external/bsd/libc++/lib  LIBDPLIBS+=     c++     ${.CURDIR}/../../../../../external/bsd/libc++/lib
 . elif defined(HAVE_GCC) && ${HAVE_GCC} == 4  
 LIBDPLIBS+=     stdc++  ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4  
 . else  . else
 LIBDPLIBS+=     stdc++  ${.CURDIR}/../../../../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3  LIBDPLIBS+=     stdc++  ${.CURDIR}/../../../../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
 . endif  . endif
Line 618  ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL
Line 618  ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}      ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
         rm -f ${.TARGET}          rm -f ${.TARGET}
         ${LIBCC} ${LDLIBC} -shared ${SHLIB_SHFLAGS} \          ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} \
             ${_LDFLAGS.${_LIB}} -o ${.TARGET} ${_LIBLDOPTS} \              ${_LDFLAGS.${_LIB}} -o ${.TARGET} ${_LIBLDOPTS} \
             -Wl,--whole-archive ${SOLIB} \              -Wl,--whole-archive ${SOLIB} \
             -Wl,--no-whole-archive ${_LDADD.${_LIB}}              -Wl,--no-whole-archive ${_LDADD.${_LIB}}
         ${OBJCOPY} -x ${.TARGET}  
 #  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.349  
changed lines
  Added in v.1.349.2.1

CVSweb <webmaster@jp.NetBSD.org>