diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2012-12-05 22:59:02 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-11 15:54:37 +0000 |
| commit | 138669057d382a4e5924933614f539431fb2ddf1 (patch) | |
| tree | e6ba4be193440784e41f7bffb061597e494b8a4e /meta | |
| parent | 89230eaa76edf2477af3f9bc31efe904d80ab71e (diff) | |
| download | poky-138669057d382a4e5924933614f539431fb2ddf1.tar.gz | |
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)
(From OE-Core rev: 4f891901bcf7be95cebca1a7296e7ea656adee74)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 4 |
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() { | |||
| 63 | 63 | ||
| 64 | if [ -f mkspecs/common/g++-base.conf ] ; then | 64 | if [ -f mkspecs/common/g++-base.conf ] ; then |
| 65 | # don't use host g++ even during configure (4.8.0+) | 65 | # don't use host g++ even during configure (4.8.0+) |
| 66 | sed -i -e "s#g++#${CXX}#" mkspecs/common/g++-base.conf | 66 | sed -i -e "s#= g++#= ${CXX}#" mkspecs/common/g++-base.conf |
| 67 | sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf | 67 | sed -i -e "s#= gcc#= ${CC}#" mkspecs/common/g++-base.conf |
| 68 | fi | 68 | fi |
| 69 | 69 | ||
| 70 | # Use qmake from qt4-native for building | 70 | # Use qmake from qt4-native for building |