diff options
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/qt4/qt4.inc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index b4f53c14b7..79240eda12 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -122,8 +122,15 @@ FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/ do_configure() { unset QMAKESPEC unset QTDIR - ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake - ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ + + if [! -e bin/qmake]; then + ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake + fi + + if [! -e mkspecs/${TARGET_OS}-oe-g++]; then + ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ + fi + cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf mkspecs/common/ echo "[Paths]" > $QT_CONF_PATH |