[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.278.2.1 and 1.296

version 1.278.2.1, 2013/02/25 00:28:17 version 1.296, 2016/02/21 03:34:27
Line 48  CLEANFILES+=strings
Line 48  CLEANFILES+=strings
         @rm -f x.cc          @rm -f x.cc
 .endif  .endif
   
 .if defined(MKPIE) && (${MKPIE} != "no")  .if defined(MKPIE) && (${MKPIE} != "no") && !defined(NOPIE)
 CFLAGS+=        ${PIE_CFLAGS}  CFLAGS+=        ${PIE_CFLAGS}
 AFLAGS+=        ${PIE_AFLAGS}  AFLAGS+=        ${PIE_AFLAGS}
 LDFLAGS+=       ${PIE_LDFLAGS}  LDFLAGS+=       ${PIE_LDFLAGS}
 .endif  .endif
   
 CFLAGS+=        ${COPTS}  CFLAGS+=        ${COPTS}
 .if defined(MKDEBUG) && (${MKDEBUG} != "no")  .if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG)
 CFLAGS+=        -g  CFLAGS+=        -g
 .endif  .endif
 OBJCFLAGS+=     ${OBJCOPTS}  OBJCFLAGS+=     ${OBJCOPTS}
 MKDEP_SUFFIXES?=        .o .ln  MKDEP_SUFFIXES?=        .o .ln .d
   
 # CTF preserve debug symbols  # CTF preserve debug symbols
 .if defined(MKDTRACE) && (${MKDTRACE} != "no") && (${CFLAGS:M-g} != "")  .if (${MKCTF:Uno} != "no") && (${CFLAGS:M-g} != "")
 CTFFLAGS+= -g  CTFFLAGS+= -g
 CTFMFLAGS+= -g  CTFMFLAGS+= -g
   .if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
   #CFLAGS+=-gdwarf-2
   .endif
 .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
 .ifndef LIBCRTBEGIN  .ifndef LIBCRTBEGIN
 LIBCRTBEGIN=    ${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGIN}  LIBCRTBEGIN=    ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o ${_GCC_CRTBEGIN}
 .MADE: ${LIBCRTBEGIN}  .MADE: ${LIBCRTBEGIN}
 .endif  .endif
 .ifndef LIBCRTEND  .ifndef LIBCRTEND
 LIBCRTEND=      ${_GCC_CRTEND} ${DESTDIR}/usr/lib/crtn.o  LIBCRTEND=      ${_GCC_CRTEND} ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtn.o
 .MADE: ${LIBCRTEND}  .MADE: ${LIBCRTEND}
 .endif  .endif
 _SHLINKER=      ${SHLINKDIR}/ld.elf_so  _SHLINKER=      ${SHLINKDIR}/ld.elf_so
   
 .ifndef LIBCRT0  .ifndef LIBCRT0
 LIBCRT0=        ${DESTDIR}/usr/lib/crt0.o  LIBCRT0=        ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crt0.o
 .MADE: ${LIBCRT0}  .MADE: ${LIBCRT0}
 .endif  .endif
   
   .ifndef LIBCRTI
   LIBCRTI=        ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o
   .MADE: ${LIBCRTI}
   .endif
   
 ##### Installed system library definitions  ##### Installed system library definitions
 #  #
 #       E.g.  #       E.g.
Line 104  LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
Line 112  LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
         c_pic \          c_pic \
         com_err \          com_err \
         compat \          compat \
         crt0 \  
         crypt \          crypt \
         crypto \          crypto \
         crypto_idea \          crypto_idea \
Line 117  LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
Line 124  LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
         edit \          edit \
         event \          event \
         expat \          expat \
           execinfo \
         fetch \          fetch \
         fl \          fl \
         form \          form \
Line 269  LIB${_lib:tu}= ${DESTDIR}${X11USRLIBDIR}
Line 277  LIB${_lib:tu}= ${DESTDIR}${X11USRLIBDIR}
 .endif  .endif
 .endfor  .endfor
   
   # Ugly one-offs
   LIBX11_XCB=     ${DESTDIR}${X11USRLIBDIR}/libX11-xcb.a
   LIBXCB= ${DESTDIR}${X11USRLIBDIR}/libxcb.a
   
 .if defined(RESCUEDIR)  .if defined(RESCUEDIR)
 CPPFLAGS+=      -DRESCUEDIR=\"${RESCUEDIR}\"  CPPFLAGS+=      -DRESCUEDIR=\"${RESCUEDIR}\"
 .endif  .endif
Line 318  _CCLINK= ${CXX} ${_CCLINKFLAGS}
Line 330  _CCLINK= ${CXX} ${_CCLINKFLAGS}
 .endif  .endif
   
 .if defined(RUMPPRG)  .if defined(RUMPPRG)
   CPPFLAGS+=      -D_KERNTYPES
 PROG=                   ${RUMPPRG}  PROG=                   ${RUMPPRG}
 . ifndef CRUNCHEDPROG  . ifndef CRUNCHEDPROG
 .  if (${MKRUMP} != "no")  .  if (${MKRUMP} != "no")
Line 421  _CCLINK.${_P}= ${CXX} ${_CCLINKFLAGS}
Line 434  _CCLINK.${_P}= ${CXX} ${_CCLINKFLAGS}
 BINDIR.${_P}?=          ${BINDIR}  BINDIR.${_P}?=          ${BINDIR}
 PROGNAME.${_P}?=        ${_P}  PROGNAME.${_P}?=        ${_P}
   
 .if ${MKDEBUG} != "no" && !commands(${_P})  .if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG) && !commands(${_P})
 _PROGDEBUG.${_P}:=      ${PROGNAME.${_P}}.debug  _PROGDEBUG.${_P}:=      ${PROGNAME.${_P}}.debug
 .endif  .endif
   
Line 472  NODPSRCS+= ${f}
Line 485  NODPSRCS+= ${f}
 .endif  .endif
 .endfor  .endfor
   
 ${_P}: .gdbinit ${LIBCRT0} ${XOBJS.${_P}} ${SRCS.${_P}} ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}  ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${XOBJS.${_P}} ${SRCS.${_P}} \
       ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
 .if defined(DESTDIR)  .if defined(DESTDIR)
         ${_CCLINK.${_P}} -Wl,-nostdlib \          ${_CCLINK.${_P}} -Wl,-nostdlib \
Line 505  CLEANFILES+= ${_P}.d
Line 519  CLEANFILES+= ${_P}.d
   
 ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}  ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
   
 ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}  ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} \
       ${LIBCRTEND} ${_DPADD.${_P}}
 .if !commands(${_P})  .if !commands(${_P})
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
         ${_CCLINK.${_P}} \          ${_CCLINK.${_P}} \
             ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} \              ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} \
             ${OBJS.${_P}} ${_LDADD.${_P}} \              ${OBJS.${_P}} ${_PROGLDOPTS} ${_LDADD.${_P}}
             ${_PROGLDOPTS}  
 .if defined(CTFMERGE)  .if defined(CTFMERGE)
         ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}          ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
 .endif  .endif
Line 526  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
Line 540  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
   
 ${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}  ${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
         ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}          ${CC} ${LDFLAGS:N-Wl,-pie} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
   
 .if defined(_PROGDEBUG.${_P})  .if defined(_PROGDEBUG.${_P})
 ${_PROGDEBUG.${_P}}: ${_P}  ${_PROGDEBUG.${_P}}: ${_P}

Legend:
Removed from v.1.278.2.1  
changed lines
  Added in v.1.296

CVSweb <webmaster@jp.NetBSD.org>