[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.338 and 1.357

version 1.338, 2013/09/12 15:36:16 version 1.357, 2015/06/02 23:00:25
Line 64  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so 
Line 64  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so 
 .endif                                                                  # }  .endif                                                                  # }
   
 ##### Build and install rules  ##### Build and install rules
 MKDEP_SUFFIXES?=        .o .po .pico .go .ln  MKDEP_SUFFIXES?=        .o .po .pico .go .ln .d
   
 .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
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 589  DPLIBC ?= ${DESTDIR}${LIBC_SO}
Line 594  DPLIBC ?= ${DESTDIR}${LIBC_SO}
 .endif  .endif
 .else  .else
 LDLIBC ?= -nodefaultlibs  LDLIBC ?= -nodefaultlibs
 .if ${LIB} == "c"  .if ${HAVE_LIBGCC} == "yes" && ${LIB} == "c"
 LDADD+= -lgcc  LDADD+= -lgcc
 .endif  .endif
 .endif  .endif
Line 597  LDADD+= -lgcc
Line 602  LDADD+= -lgcc
   
 .if ${LIBISCXX} != "no"  .if ${LIBISCXX} != "no"
 LIBCC:= ${CXX}  LIBCC:= ${CXX}
   . if ${MKLIBCXX} == "yes"
   LIBDPLIBS+=     c++     ${.CURDIR}/../../../../../external/bsd/libc++/lib
   . else
   LIBDPLIBS+=     stdc++  ${.CURDIR}/../../../../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
   . endif
 .else  .else
 LIBCC:= ${CC}  LIBCC:= ${CC}
 .endif  .endif
Line 631  ${_LIB.so.debug}: ${_LIB.so.full}
Line 641  ${_LIB.so.debug}: ${_LIB.so.full}
         ${_MKTARGET_CREATE}          ${_MKTARGET_CREATE}
         (  ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \          (  ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \
         && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \          && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
                 --add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \              --add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \
               ${_LIB.so.full}.tmp && mv -f ${_LIB.so.full}.tmp ${_LIB.so.full} \
         ) || (rm -f ${.TARGET}; false)          ) || (rm -f ${.TARGET}; false)
 .endif  .endif
   
Legend:
Removed from v.1.338  
changed lines
  Added in v.1.357
CVSweb <webmaster@jp.NetBSD.org>