summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'eclass/qt4-build.eclass')
-rw-r--r--eclass/qt4-build.eclass8
1 files changed, 7 insertions, 1 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 237d7880a545..443427cdd7c8 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
# Copyright 2007-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.49 2009/11/09 19:30:40 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.50 2009/11/09 19:35:44 ayoy Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -178,6 +178,12 @@ qt4-build_src_prepare() {
symlink_binaries_to_buildtree
fi
+ # Bug 282984
+ sed -e "s/\(^SYSTEM_VARIABLES\)/CC=$(tc-getCC)\nCXX=$(tc-getCXX)\n\1/" \
+ -i configure || die "sed qmake compilers failed"
+ sed -e "s/\(\$MAKE\)/\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX)/" \
+ -i config.tests/unix/compile.test || die "sed test compilers failed"
+
# Bug 178652
if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"