summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2012-12-01 16:26:03 +0000
committerMichał Górny <mgorny@gentoo.org>2012-12-01 16:26:03 +0000
commit8e6d3852a3d1632d16d848b0cb7fdd67f6b69392 (patch)
tree08dba0be9797ef638c79b4307d0f8b842ad4e8a8 /eclass/autotools-multilib.eclass
parentstable arm ppc64, bug #444672 (diff)
downloadgentoo-2-8e6d3852a3d1632d16d848b0cb7fdd67f6b69392.tar.gz
gentoo-2-8e6d3852a3d1632d16d848b0cb7fdd67f6b69392.tar.bz2
gentoo-2-8e6d3852a3d1632d16d848b0cb7fdd67f6b69392.zip
Use a common BUILD_DIR variable. Acked by scarabeus.
Diffstat (limited to 'eclass/autotools-multilib.eclass')
-rw-r--r--eclass/autotools-multilib.eclass10
1 files changed, 6 insertions, 4 deletions
diff --git a/eclass/autotools-multilib.eclass b/eclass/autotools-multilib.eclass
index f6d1feb3051c..fe6372d42267 100644
--- a/eclass/autotools-multilib.eclass
+++ b/eclass/autotools-multilib.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.1 2012/10/08 18:44:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.2 2012/12/01 16:26:03 mgorny Exp $
# @ECLASS: autotools-multilib.eclass
# @MAINTAINER:
@@ -38,17 +38,19 @@ IUSE=multilib
# @USAGE: argv...
# @DESCRIPTION:
# If multilib support is enabled, sets the toolchain up for each
-# supported ABI along with the ABI variable and correct
-# AUTOTOOLS_BUILD_DIR, and runs the given commands with them.
+# supported ABI along with the ABI variable and correct BUILD_DIR,
+# and runs the given commands with them.
#
# If multilib support is disabled, it just runs the commands. No setup
# is done.
autotools-multilib_foreach_abi() {
+ local initial_dir=${BUILD_DIR:-${S}}
+
if use multilib; then
local ABI
for ABI in $(get_all_abis); do
multilib_toolchain_setup "${ABI}"
- AUTOTOOLS_BUILD_DIR=${S%%/}-${ABI} "${@}"
+ BUILD_DIR=${initial_dir%%/}-${ABI} "${@}"
done
else
"${@}"