]> code.ossystems Code Review - openembedded-core.git/commitdiff
nativesdk-qt4-tools: fix do_configure to be reentrant
authorMartin Jansa <martin.jansa@gmail.com>
Wed, 5 Dec 2012 21:59:02 +0000 (22:59 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 11 Dec 2012 15:54:26 +0000 (15:54 +0000)
* 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>
meta/recipes-qt/qt4/nativesdk-qt4-tools.inc

index 85c7eabbc37be60bff385fb84bda0687cc6a0b39..5ed0e90553d33fa5e958a18b357183957068be65 100644 (file)
@@ -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