[gentoo-commits] proj/portage:multilib commit in: bin/

["Thomas Sachau" <tommy@gentoo.org>]

commit:     9735a747c4a5d9cd79d3a04b37dffb0e0ee26a49
Author:     Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 01:25:10 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 01:41:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9735a747

Fix portage-multilib compilation of asm files (for autotools projects) when the user has set CCASFLAGS in make.conf.

During ./configure, if CCASFLAGS is unest it will default to CFLAGS
(or in essence, ${CCASFLAGS:=${CFLAGS}}). The old portage-multilib
behavior was to not define CCASFLAGS. However, certain users may wish
to define CCASFLAGS. In such a scenario, -m32 would never enter into
CCASFLAGS because the user's CCASFLAGS would be used by ./configure
instead of CFLAGS.

This patch causes portage-multilib to set CCASFLAGS to CFLAGS if it is
unset and then append the ABI-specific CFLAGS (such as -m32). This
allows a user to have different CCASFLAGS and still have successful
multilib builds.

---
 bin/auto-multilib.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 9fc3b01..73259d9 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -227,6 +227,7 @@ _setup_abi_env() {
 	export CHOST=$(get_abi_var CHOST $1)
 	export CBUILD=$(get_abi_var CHOST $1)
 	export CDEFINE="$(get_abi_var CDEFINE $1)"
+	export CCASFLAGS="${CCASFLAGS:-${CFLAGS}} $(get_abi_var CFLAGS)"
 	export CFLAGS="${CFLAGS} $(get_abi_var CFLAGS)"
 	export CPPFLAGS="${CPPFLAGS} $(get_abi_var CPPFLAGS)"
 	export CXXFLAGS="${CXXFLAGS} $(get_abi_var CFLAGS)"