summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-12-05 22:59:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-11 15:54:26 +0000
commit4f891901bcf7be95cebca1a7296e7ea656adee74 (patch)
tree689c590778f684d84914a37c3c3798ac9d405bd0 /meta/recipes-qt
parent5d898695ab3ce368a1d1f2066bb980ee829ae077 (diff)
downloadopenembedded-core-4f891901bcf7be95cebca1a7296e7ea656adee74.tar.gz
openembedded-core-4f891901bcf7be95cebca1a7296e7ea656adee74.tar.bz2
openembedded-core-4f891901bcf7be95cebca1a7296e7ea656adee74.zip
nativesdk-qt4-tools: fix do_configure to be reentrant
* without = it can add g++ prefix multiple time when you reexecute do_configure (e.g. after failure) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 85c7eabbc3..5ed0e90553 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -63,8 +63,8 @@ do_configure() {
if [ -f mkspecs/common/g++-base.conf ] ; then
# don't use host g++ even during configure (4.8.0+)
- sed -i -e "s#g++#${CXX}#" mkspecs/common/g++-base.conf
- sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf
+ sed -i -e "s#= g++#= ${CXX}#" mkspecs/common/g++-base.conf
+ sed -i -e "s#= gcc#= ${CC}#" mkspecs/common/g++-base.conf
fi
# Use qmake from qt4-native for building