summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2016-03-10 13:05:33 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2016-03-17 09:30:28 +0000
commitbea48bd0716cc8c60d4e3b3ddb497555f1905b33 (patch)
treebb876b232637f63dde5154ad111d8b26837e19f7
parentef1c1f258ab449230d644442df667f89023f38d4 (diff)
downloadmeta-boot2qt-bea48bd0716cc8c60d4e3b3ddb497555f1905b33.tar.gz
qt5: remove duplicate --sysroot from sdk mkspec
No need to add --sysroot to QMAKE flags in qdevice.pri, since qconfig.pri does it already. Change-Id: I8a90249e466f8385fb121d69721e118a32b80999 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
-rw-r--r--classes/populate_b2qt_qt5_sdk.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass
index 5f45b05..d6b2b10 100644
--- a/classes/populate_b2qt_qt5_sdk.bbclass
+++ b/classes/populate_b2qt_qt5_sdk.bbclass
@@ -49,9 +49,9 @@ EOF
49 done 49 done
50 echo "MACHINE = ${MACHINE}" > ${SDK_DEVICE_PRI} 50 echo "MACHINE = ${MACHINE}" > ${SDK_DEVICE_PRI}
51 echo "CROSS_COMPILE = \$\$[QT_HOST_PREFIX]${bindir_nativesdk}/${TARGET_SYS}/${TARGET_PREFIX}" >> ${SDK_DEVICE_PRI} 51 echo "CROSS_COMPILE = \$\$[QT_HOST_PREFIX]${bindir_nativesdk}/${TARGET_SYS}/${TARGET_PREFIX}" >> ${SDK_DEVICE_PRI}
52 echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH} --sysroot=\$\$[QT_SYSROOT] ${static_cflags}" >> ${SDK_DEVICE_PRI} 52 echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH} ${static_cflags}" >> ${SDK_DEVICE_PRI}
53 echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH} --sysroot=\$\$[QT_SYSROOT] ${static_cxxflags}" >> ${SDK_DEVICE_PRI} 53 echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH} ${static_cxxflags}" >> ${SDK_DEVICE_PRI}
54 echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} --sysroot=\$\$[QT_SYSROOT] ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI} 54 echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI}
55 55
56 # Setup qt.conf to point at the device mkspec by default 56 # Setup qt.conf to point at the device mkspec by default
57 qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf 57 qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf