aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-08-14 00:38:25 -0400
committerMike Frysinger <vapier@gentoo.org>2010-08-14 00:38:25 -0400
commita31d21dc6895115a7f10af275b31e0bc6283b6b2 (patch)
treeda96c859ef898c073eec06ae2ee2dcd82d627949 /wrappers
parentemerge-wrapper: rewrite & integrate with crossdev (diff)
downloadcrossdev-a31d21dc6895115a7f10af275b31e0bc6283b6b2.tar.gz
crossdev-a31d21dc6895115a7f10af275b31e0bc6283b6b2.tar.bz2
crossdev-a31d21dc6895115a7f10af275b31e0bc6283b6b2.zip
cross-emerge: lookup CBUILD with a clean env
URL: http://bugs.gentoo.org/331589 Reported-by: Juan P Daza P <tcpip4000@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'wrappers')
-rwxr-xr-xwrappers/cross-emerge6
1 files changed, 4 insertions, 2 deletions
diff --git a/wrappers/cross-emerge b/wrappers/cross-emerge
index 4fd19b9..85f847d 100755
--- a/wrappers/cross-emerge
+++ b/wrappers/cross-emerge
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 2008-2009 Gentoo Foundation
+# Copyright 2008-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
if [ -z "${CHOST}" ] ; then
@@ -18,7 +18,9 @@ if [ -z "${CHOST}" ] || [ ! -d "${SYSROOT}" ] ; then
exit 1
fi
-: ${CBUILD=$(portageq envvar CBUILD)}
+# Portage defaults CBUILD to CHOST, so we have to remove CHOST
+# from the env to get a "good" value for CBUILD
+: ${CBUILD=$(env -i portageq envvar CBUILD)}
: ${BUILD_CFLAGS=$(env -i portageq envvar CFLAGS)}
: ${BUILD_CXXFLAGS=$(env -i portageq envvar CXXFLAGS)}
: ${BUILD_CPPFLAGS=$(env -i portageq envvar CPPFLAGS)}