[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.339 and 1.353

version 1.339, 2013/09/12 17:14:20 version 1.353, 2014/04/11 16:51:43
Line 185  FFLAGS+= ${FOPTS}
Line 185  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 442  ${_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 521  _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 592  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 599  LDADD+= -lgcc
Line 602  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 ${HAVE_GCC} == 4  . elif defined(HAVE_GCC) && ${HAVE_GCC} == 4
 LIBDPLIBS+=     stdc++  ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_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.339  
changed lines
  Added in v.1.353
CVSweb <webmaster@jp.NetBSD.org>