svn commit: r210612 - head/share/mk

[Anonymous]

Rui Paulo <rpaulo at FreeBSD.org> writes:

> Author: rpaulo
> Date: Thu Jul 29 16:30:27 2010
> New Revision: 210612
> URL: http://svn.freebsd.org/changeset/base/210612
>
> Log:
>   When building WITH_CTF=1, print the ctf executable that's going to be
>   run. This makes the 'ctfconvert' and 'ctfmerge' programs show up during
>   a build when compiling a kernel, a library or a program.
>   
>   Sponsored by:	The FreeBSD Foundation
>
> Modified:
>   head/share/mk/bsd.lib.mk
>   head/share/mk/bsd.prog.mk
>   head/share/mk/sys.mk
>
[...]
> Modified: head/share/mk/sys.mk
> ==============================================================================
> --- head/share/mk/sys.mk	Thu Jul 29 16:13:26 2010	(r210611)
> +++ head/share/mk/sys.mk	Thu Jul 29 16:30:27 2010	(r210612)
> @@ -156,11 +156,15 @@ YFLAGS		?=	-d
>  # SINGLE SUFFIX RULES
>  .c:
>  	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.IMPSRC}
> -	@[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
> +	@[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
> +		${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
> +		${CTFCONVERT} ${CTFFLAGS} ${.TARGET}

After this commit ctfconvert breaks buildworld for me.

  $ make -j3 -Qs buildworld
  ...
  ===> lib/libelf (all)
  ERROR: ctfmerge: libelf.so.1: Cannot get sect .gnu.version_d data: Invalid section descriptor

  $ echo 'int main(void) { return(0); }' >test.c
  $ make -dA test |& fgrep -A2 -- '-o test'
  cc -O0 -g3  test.c  -o test
  [ -z "ctfconvert" -o -n "1" ] ||  echo ctfconvert -L VERSION test &&  ctfconvert -L VERSION test
  ERROR: crt1.c: multiple compilation units not supported

  $ true || { echo foo && echo bar; }
  $ true || echo foo && echo bar
  bar