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

[hasufell]

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"