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

version 1.342, 2013/10/18 16:06:52 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 185  FFLAGS+= ${FOPTS}
Line 187  FFLAGS+= ${FOPTS}
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
 .if defined(CFLAGS) && !empty(CFLAGS:M*-g*)  .if defined(CFLAGS) && !empty(CFLAGS:M*-g*)
 CTFFLAGS+=      -g  CTFFLAGS+=      -g
   .if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
   #CFLAGS+=       -gdwarf-2
   .endif
 .endif  .endif
 .endif  .endif
   
Line 439  ${_LIB}_combine.o: ${COMBINESRCS}
Line 444  ${_LIB}_combine.o: ${COMBINESRCS}
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}          ${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}
 .if defined(LIBSTRIPOBJS)  .if defined(LIBSTRIPOBJS)
         ${OBJCOPY} -x ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
 CLEANFILES+=    ${_LIB}_combine.d  CLEANFILES+=    ${_LIB}_combine.d
Line 518  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
Line 523  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
   
 realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} ${_LIB.so.debug}  realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} ${_LIB.so.debug}
   
 MKARZERO?=no  MKARZERO?= ${MKREPRO:Uno}
   
 .if ${MKARZERO} == "yes"  .if ${MKARZERO} == "yes"
 _ARFL=crsD  _ARFL=crsD
Line 599  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/gcc/lib/libstdc++-v3  LIBDPLIBS+=     stdc++  ${.CURDIR}/../../../../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
 . endif  . endif
 .else  .else
 LIBCC:= ${CC}  LIBCC:= ${CC}
Legend:
Removed from v.1.342  
changed lines
  Added in v.1.349.2.1
CVSweb <webmaster@jp.NetBSD.org>