diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-06-17 20:00:37 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-06-17 20:00:37 +0000 |
| commit | 07f41965af3aed4c78e7d62f73b42cf4e37a7e0b (patch) | |
| tree | 4e2e31d2f342bf3302a5ccd9f288b7191347674c | |
| parent | Fix build with libav9. Fixes bug#443244. (diff) | |
| download | gentoo-2-07f41965af3aed4c78e7d62f73b42cf4e37a7e0b.tar.gz gentoo-2-07f41965af3aed4c78e7d62f73b42cf4e37a7e0b.tar.bz2 gentoo-2-07f41965af3aed4c78e7d62f73b42cf4e37a7e0b.zip | |
freebsd_multilib_multibuild_wrapper: save and restore LDADD too.
| -rw-r--r-- | eclass/freebsd.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index 613c67aa2666..f3b6bc3b6b64 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.25 2013/06/17 17:31:30 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.26 2013/06/17 20:00:37 aballier Exp $ # # Diego Pettenò <flameeyes@gentoo.org> @@ -135,8 +135,8 @@ freebsd_multilib_multibuild_wrapper() { # This assumes MULTILIB_VARIANTS contains only valid ABIs. local ABI=${MULTIBUILD_VARIANT} - # First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts. - for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do + # First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS, LDADD and mymakeopts. + for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do export ${i}_SAVE="${!i}" done @@ -159,7 +159,7 @@ freebsd_multilib_multibuild_wrapper() { CTARGET="${CHOST}" "$@" # Restore the variables now. - for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do + for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do ii="${i}_SAVE" export ${i}="${!ii}" done |