| 1 |
On Sun, 06 Apr 2014 15:45:34 +0000 |
| 2 |
hasufell <hasufell@g.o> wrote: |
| 3 |
|
| 4 |
> respect CFLAGS in linking command |
| 5 |
> https://bugs.gentoo.org/show_bug.cgi?id=506956 |
| 6 |
> |
| 7 |
> --- eclass/waf-utils.eclass |
| 8 |
> +++ eclass/waf-utils.eclass |
| 9 |
> @@ -56,18 +56,18 @@ |
| 10 |
> [[ -z ${NO_WAF_LIBDIR} ]] && |
| 11 |
> libdir="--libdir=${EPREFIX}/usr/$(get_libdir)" |
| 12 |
> tc-export AR CC CPP CXX RANLIB |
| 13 |
> - echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" |
| 14 |
> \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir} $@ configure" |
| 15 |
> + echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${CFLAGS} ${LDFLAGS}\" |
| 16 |
> \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir} $@ configure" |
| 17 |
> # This condition is required because waf takes even whitespace as |
| 18 |
> function # calls, awesome isn't it? |
| 19 |
> if [[ -z ${NO_WAF_LIBDIR} ]]; then |
| 20 |
> - CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ |
| 21 |
> + CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" |
| 22 |
> "${WAF_BINARY}" \ "--prefix=${EPREFIX}/usr" \ |
| 23 |
> "${libdir}" \ |
| 24 |
> "$@" \ |
| 25 |
> configure || die "configure failed" |
| 26 |
> else |
| 27 |
> - CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ |
| 28 |
> + CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" |
| 29 |
> "${WAF_BINARY}" \ "--prefix=${EPREFIX}/usr" \ |
| 30 |
> "$@" \ |
| 31 |
> configure || die "configure failed" |
| 32 |
|
| 33 |
Good. |
| 34 |
|
| 35 |
|
| 36 |
-- |
| 37 |
Ryan Hill psn: dirtyepic_sk |
| 38 |
gcc-porting/toolchain/wxwidgets @ gentoo.org |
| 39 |
|
| 40 |
47C3 6D62 4864 0E49 8E9E 7F92 ED38 BD49 957A 8463 |
Archives