| 1 |
respect CFLAGS in linking command |
| 2 |
https://bugs.gentoo.org/show_bug.cgi?id=506956 |
| 3 |
|
| 4 |
--- eclass/waf-utils.eclass |
| 5 |
+++ eclass/waf-utils.eclass |
| 6 |
@@ -56,18 +56,18 @@ |
| 7 |
[[ -z ${NO_WAF_LIBDIR} ]] && libdir="--libdir=${EPREFIX}/usr/$(get_libdir)" |
| 8 |
|
| 9 |
tc-export AR CC CPP CXX RANLIB |
| 10 |
- echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir} $@ configure" |
| 11 |
+ echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${CFLAGS} ${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir} $@ configure" |
| 12 |
|
| 13 |
# This condition is required because waf takes even whitespace as function |
| 14 |
# calls, awesome isn't it? |
| 15 |
if [[ -z ${NO_WAF_LIBDIR} ]]; then |
| 16 |
- CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ |
| 17 |
+ CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \ |
| 18 |
"--prefix=${EPREFIX}/usr" \ |
| 19 |
"${libdir}" \ |
| 20 |
"$@" \ |
| 21 |
configure || die "configure failed" |
| 22 |
else |
| 23 |
- CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ |
| 24 |
+ CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \ |
| 25 |
"--prefix=${EPREFIX}/usr" \ |
| 26 |
"$@" \ |
| 27 |
configure || die "configure failed" |
Archives