[patch] waf-utils.eclass.patch

waf-utils.eclass.patch (text/plain), 1.06 KB, created by Julian Ospald on 2014-04-06 15:38:52 UTC

respect CFLAGS in linking command

--- 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"