summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-19 12:54:47 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-19 12:54:47 +0000
commit315f2b6d02fbf228f079d9b8ac793ff4cf933ba6 (patch)
tree32cc2e8f867e5f32ef022094c3eac00e1bd20e98 /eclass
parent[QA] Respect LDFLAGS wrt bug 335095, credit to Christophe Lefebvre <chtof62@g... (diff)
downloadgentoo-2-315f2b6d02fbf228f079d9b8ac793ff4cf933ba6.tar.gz
gentoo-2-315f2b6d02fbf228f079d9b8ac793ff4cf933ba6.tar.bz2
gentoo-2-315f2b6d02fbf228f079d9b8ac793ff4cf933ba6.zip
Always set up CC, CXX and friends for distutils builds, bug #513664. Thanks to Arfrever for the explanation.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/distutils-r1.eclass11
2 files changed, 14 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 23ea9a754f50..b1983d039741 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1292 2014/06/19 09:28:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1293 2014/06/19 12:54:47 mgorny Exp $
+
+ 19 Jun 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+ Always set up CC, CXX and friends for distutils builds, bug #513664. Thanks
+ to Arfrever for the explanation.
19 Jun 2014; Michał Górny <mgorny@gentoo.org> gstreamer.eclass:
Bump gstreamer deps to satisfy multilib.
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 72b2c33bdf63..700dc717c715 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.96 2014/05/19 05:00:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.97 2014/06/19 12:54:47 mgorny Exp $
# @ECLASS: distutils-r1
# @MAINTAINER:
@@ -79,7 +79,7 @@ esac
if [[ ! ${_DISTUTILS_R1} ]]; then
-inherit eutils
+inherit eutils toolchain-funcs
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
inherit multiprocessing python-r1
@@ -596,6 +596,13 @@ distutils-r1_run_phase() {
mkdir -p "${TMPDIR}" "${HOME}" || die
fi
+ # Set up build environment, bug #513664.
+ local -x AR=${AR} CC=${CC} CPP=${CPP} CXX=${CXX}
+ tc-export AR CC CPP CXX
+
+ # XXX: portability for -shared?
+ local -x LDSHARED="${CC} -shared" LDCXXSHARED="${CXX} -shared"
+
"${@}"
if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]