diff options
Diffstat (limited to 'recipes-qt/qt5/qt5.inc')
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 8ed4c288..2a0ae591 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -56,6 +56,7 @@ QT_CONFIG_FLAGS += " \ " do_configure() { +# set_arch set_endian if [ ! -e bin/qmake ]; then @@ -66,13 +67,9 @@ do_configure() { ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ fi - if [ -f mkspecs/common/g++-unix.conf ] ; then - # mkspecs were refactored for 4.8.0 - cp -f ${WORKDIR}/g++.conf mkspecs/common/g++-unix.conf - else - cp -f ${WORKDIR}/g++.conf mkspecs/common/g++.conf - fi - cp -f ${WORKDIR}/linux.conf mkspecs/common/ + # replace common files with our version + cp -f ${WORKDIR}/g++.conf mkspecs/common/g++-unix.conf + cp -f ${WORKDIR}/linux.conf mkspecs/common/linux.conf # Avoid problems with the linkers, since we want the linker to be g++ unset LD |