diff options
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 6d1c7d2d..adf0a43c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -171,6 +171,13 @@ QT_CONFIG_FLAGS += " \ | |||
171 | ${PACKAGECONFIG_CONFARGS} \ | 171 | ${PACKAGECONFIG_CONFARGS} \ |
172 | " | 172 | " |
173 | 173 | ||
174 | export CC_host_toolchain-clang = "clang" | ||
175 | export CXX_host_toolchain-clang = "clang++" | ||
176 | export LD_host_toolchain-clang = "clang++" | ||
177 | export CC_host ?= "gcc" | ||
178 | export CXX_host ?= "g++" | ||
179 | export LD_host ?= "g++" | ||
180 | |||
174 | # for qtbase configuration we need default settings | 181 | # for qtbase configuration we need default settings |
175 | # since we cannot set empty set filename to a not existent file | 182 | # since we cannot set empty set filename to a not existent file |
176 | deltask generate_qt_config_file | 183 | deltask generate_qt_config_file |
@@ -249,6 +256,9 @@ do_install_append() { | |||
249 | echo "isEmpty(QMAKE_LINK_C_SHLIB): QMAKE_LINK_C_SHLIB = $OE_QMAKE_LINK_NO_SYSROOT" >> $conf | 256 | echo "isEmpty(QMAKE_LINK_C_SHLIB): QMAKE_LINK_C_SHLIB = $OE_QMAKE_LINK_NO_SYSROOT" >> $conf |
250 | echo "isEmpty(QMAKE_LFLAGS): QMAKE_LFLAGS = ${OE_QMAKE_LDFLAGS}" >> $conf | 257 | echo "isEmpty(QMAKE_LFLAGS): QMAKE_LFLAGS = ${OE_QMAKE_LDFLAGS}" >> $conf |
251 | echo "isEmpty(QMAKE_STRIP): QMAKE_STRIP = ${TARGET_PREFIX}strip" >> $conf | 258 | echo "isEmpty(QMAKE_STRIP): QMAKE_STRIP = ${TARGET_PREFIX}strip" >> $conf |
259 | echo "isEmpty(CC_host): CC_host = ${CC_host}" >> $conf | ||
260 | echo "isEmpty(CXX_host): CXX_host = ${CXX_host}" >> $conf | ||
261 | echo "isEmpty(LD_host): LD_host = ${LD_host}" >> $conf | ||
252 | 262 | ||
253 | generate_target_qt_config_file ${D}${OE_QMAKE_PATH_BINS}/qt.conf | 263 | generate_target_qt_config_file ${D}${OE_QMAKE_PATH_BINS}/qt.conf |
254 | 264 | ||