svn commit: r272827 - head

[Peter Wemm]

On Thursday, October 09, 2014 03:52:01 PM Baptiste Daroussin wrote:
> Author: bapt
> Date: Thu Oct  9 15:52:01 2014
> New Revision: 272827
> URL: https://svnweb.freebsd.org/changeset/base/272827
> 
> Log:
>   Add size(1) to the cross build toolchain
> 
> Modified:
>   head/Makefile.inc1
> 
> Modified: head/Makefile.inc1
> ============================================================================
> == --- head/Makefile.inc1	Thu Oct  9 15:35:28 2014	(r272826)
> +++ head/Makefile.inc1	Thu Oct  9 15:52:01 2014	(r272827)
> @@ -315,7 +315,7 @@ X${COMPILER}?=	${CROSS_COMPILER_PREFIX}$
>  X${COMPILER}?=	${${COMPILER}}
>  .endif
>  .endfor
> -XBINUTILS=	AS AR LD NM OBJCOPY OBJDUMP RANLIB STRINGS
> +XBINUTILS=	AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS
>  .for BINUTIL in ${XBINUTILS}
>  .if defined(CROSS_BINUTILS_PREFIX)
>  X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
> @@ -327,7 +327,8 @@ WMAKEENV+=	CC="${XCC} ${XFLAGS}" CXX="${
>  		CPP="${XCPP} ${XFLAGS}" \
>  		AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
>  		OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \
> -		RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
> +		RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
> +		SIZE="${XSIZE}"
> 
>  .if ${XCC:M/*}
>  XFLAGS=		--sysroot=${WORLDTMP}

This broke 'make buildkernel'.

kern.pre.mk:
SIZE?=  size

kern.post.mk:
SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \
        ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET}

This is getting executed as:
objcopy --strip-symbol gcc2_compiled. .kernel ; kernel ; chmod 755 kernel

ie: "kernel" instead of "size kernel".  XSIZE isn't set for the non-cross 
case.

-- 
Peter Wemm - peter at wemm.org; peter at FreeBSD.org; peter at yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20141009/ed33ef74/attachment.sig>