[BACK]Return to bsd.prog.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.prog.mk between version 1.248 and 1.249

version 1.248, 2010/04/24 07:57:04 version 1.249, 2010/07/06 05:59:56
Line 70  CTFMFLAGS+= -g
Line 70  CTFMFLAGS+= -g
 .endif  .endif
   
 # ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o  # ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
 .if ${OBJECT_FMT} == "ELF"  
 .ifndef LIBCRTBEGIN  .ifndef LIBCRTBEGIN
 LIBCRTBEGIN=    ${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGIN}  LIBCRTBEGIN=    ${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGIN}
 .MADE: ${LIBCRTBEGIN}  .MADE: ${LIBCRTBEGIN}
Line 80  LIBCRTEND= ${_GCC_CRTEND} ${DESTDIR}/usr
Line 79  LIBCRTEND= ${_GCC_CRTEND} ${DESTDIR}/usr
 .MADE: ${LIBCRTEND}  .MADE: ${LIBCRTEND}
 .endif  .endif
 _SHLINKER=      ${SHLINKDIR}/ld.elf_so  _SHLINKER=      ${SHLINKDIR}/ld.elf_so
 .else  
 LIBCRTBEGIN?=  
 LIBCRTEND?=  
 _SHLINKER=      ${SHLINKDIR}/ld.so  
 .endif  
   
 .ifndef LIBCRT0  .ifndef LIBCRT0
 LIBCRT0=        ${DESTDIR}/usr/lib/crt0.o  LIBCRT0=        ${DESTDIR}/usr/lib/crt0.o
Line 167  CPPFLAGS+= -DRESCUEDIR=\"${RESCUEDIR}\"
Line 161  CPPFLAGS+= -DRESCUEDIR=\"${RESCUEDIR}\"
   
 _PROGLDOPTS=  _PROGLDOPTS=
 .if ${SHLINKDIR} != "/usr/libexec"      # XXX: change or remove if ld.so moves  .if ${SHLINKDIR} != "/usr/libexec"      # XXX: change or remove if ld.so moves
 .if ${OBJECT_FMT} == "ELF"  
 _PROGLDOPTS+=   -Wl,-dynamic-linker=${_SHLINKER}  _PROGLDOPTS+=   -Wl,-dynamic-linker=${_SHLINKER}
 .endif  .endif
 .endif  
 .if ${SHLIBDIR} != "/usr/lib"  .if ${SHLIBDIR} != "/usr/lib"
 _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}${SHLIBDIR} \  _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}${SHLIBDIR} \
                 -R${SHLIBDIR} \                  -R${SHLIBDIR} \
Line 262  _CCLINK.${_P}= ${CXX} ${_CCLINKFLAGS}
Line 254  _CCLINK.${_P}= ${CXX} ${_CCLINKFLAGS}
 BINDIR.${_P}?=          ${BINDIR}  BINDIR.${_P}?=          ${BINDIR}
 PROGNAME.${_P}?=        ${_P}  PROGNAME.${_P}?=        ${_P}
   
 .if ${MKDEBUG} != "no" && ${OBJECT_FMT} == "ELF" && !commands(${_P})  .if ${MKDEBUG} != "no" && !commands(${_P})
 _PROGDEBUG.${_P}:=      ${PROGNAME.${_P}}.debug  _PROGDEBUG.${_P}:=      ${PROGNAME.${_P}}.debug
 .endif  .endif
   

Legend:
Removed from v.1.248  
changed lines
  Added in v.1.249

CVSweb <webmaster@jp.NetBSD.org>