[gentoo-dev] Re: [PATCH] waf-utils.eclass: respect CFLAGS in linking command

[Ryan Hill <rhill@gentoo.org>]

[-- Attachment #1: Type: text/plain, Size: 1457 bytes --]

On Sun, 06 Apr 2014 15:45:34 +0000
hasufell <hasufell@gentoo.org> wrote:

> respect CFLAGS in linking command
> https://bugs.gentoo.org/show_bug.cgi?id=506956
> 
> --- eclass/waf-utils.eclass
> +++ eclass/waf-utils.eclass
> @@ -56,18 +56,18 @@
>  	[[ -z ${NO_WAF_LIBDIR} ]] &&
> libdir="--libdir=${EPREFIX}/usr/$(get_libdir)" 
>  	tc-export AR CC CPP CXX RANLIB
> -	echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\"
> \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir} $@ configure"
> +	echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${CFLAGS} ${LDFLAGS}\"
> \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir} $@ configure" 
>  	# This condition is required because waf takes even whitespace as
> function # calls, awesome isn't it?
>  	if [[ -z ${NO_WAF_LIBDIR} ]]; then
> -		CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
> +		CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}"
> "${WAF_BINARY}" \ "--prefix=${EPREFIX}/usr" \
>  			"${libdir}" \
>  			"$@" \
>  			configure || die "configure failed"
>  	else
> -		CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
> +		CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}"
> "${WAF_BINARY}" \ "--prefix=${EPREFIX}/usr" \
>  			"$@" \
>  			configure || die "configure failed"

Good.


-- 
Ryan Hill                        psn: dirtyepic_sk
   gcc-porting/toolchain/wxwidgets @ gentoo.org

47C3 6D62 4864 0E49 8E9E  7F92 ED38 BD49 957A 8463

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 490 bytes --]