[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.262 and 1.263

version 1.262, 2011/03/08 07:53:43 version 1.263, 2011/04/10 16:52:36
Line 52  AFLAGS+= ${PIE_AFLAGS}
Line 52  AFLAGS+= ${PIE_AFLAGS}
 LDFLAGS+=       ${PIE_LDFLAGS}  LDFLAGS+=       ${PIE_LDFLAGS}
 .endif  .endif
   
 ##### Default values  
 .if !defined(HOSTLIB)  
 .if empty(CPPFLAGS:M-nostdinc)  
 CPPFLAGS+=      ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}  
 .endif  
 .if empty(CXXFLAGS:M-nostdinc++)  
 CXXFLAGS+=      ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}  
 .endif  
 .endif  
   
 CFLAGS+=        ${COPTS}  CFLAGS+=        ${COPTS}
 OBJCFLAGS+=     ${OBJCOPTS}  OBJCFLAGS+=     ${OBJCOPTS}
 MKDEP_SUFFIXES?=        .o .ln  MKDEP_SUFFIXES?=        .o .ln
Line 172  _PROGLDOPTS=
Line 162  _PROGLDOPTS=
 _PROGLDOPTS+=   -Wl,-dynamic-linker=${_SHLINKER}  _PROGLDOPTS+=   -Wl,-dynamic-linker=${_SHLINKER}
 .endif  .endif
 .if ${SHLIBDIR} != "/usr/lib"  .if ${SHLIBDIR} != "/usr/lib"
 _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}${SHLIBDIR} \  _PROGLDOPTS+=   -Wl,-rpath-link,=${SHLIBDIR} \
                 -Wl,-rpath,${SHLIBDIR} \                  -Wl,-rpath,=${SHLIBDIR} \
                 -L${DESTDIR}${SHLIBDIR}                  -L=${SHLIBDIR}
 .elif ${SHLIBINSTALLDIR} != "/usr/lib"  .elif ${SHLIBINSTALLDIR} != "/usr/lib"
 _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \  _PROGLDOPTS+=   -Wl,-rpath-link,=${SHLIBINSTALLDIR} \
                 -L${DESTDIR}${SHLIBINSTALLDIR}                  -L=${SHLIBINSTALLDIR}
 .endif  .endif
 _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}/usr/lib \  
                 -L${DESTDIR}/usr/lib  
   
 __proginstall: .USE  __proginstall: .USE
         ${_MKTARGET_INSTALL}          ${_MKTARGET_INSTALL}
Line 208  _APPEND_MANS=yes
Line 196  _APPEND_MANS=yes
 _APPEND_SRCS=yes  _APPEND_SRCS=yes
   
 _CCLINKFLAGS=  _CCLINKFLAGS=
 .if defined(DESTDIR)  
 _CCLINKFLAGS+=  -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/  
 .endif  
   
 .if defined(PROG_CXX)  .if defined(PROG_CXX)
 PROG=           ${PROG_CXX}  PROG=           ${PROG_CXX}
Line 327  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
Line 312  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
 .if !commands(${_P})  .if !commands(${_P})
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
         ${_CCLINK.${_P}} \          ${_CCLINK.${_P}} \
             ${DESTDIR:D-Wl,-nostdlib} \  
             ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} \              ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} \
             ${OBJS.${_P}} ${_LDADD.${_P}} \              ${OBJS.${_P}} ${_LDADD.${_P}} \
             ${DESTDIR:D-L${_GCC_LIBGCCDIR}} \  
             ${_PROGLDOPTS}              ${_PROGLDOPTS}
 .if defined(CTFMERGE)  .if defined(CTFMERGE)
         ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}          ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
Legend:
Removed from v.1.262  
changed lines
  Added in v.1.263
CVSweb <webmaster@jp.NetBSD.org>