From 21ce4c124d9a972d9122f87c64ac2773bf04c284 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 3 Nov 2020 09:35:52 +0200 Subject: qtbase: fix default value for QMAKE_AR The QMAKE_AR value is never empty as it always has at least the cqs argument. Use the default value if the variable has exactly one argument. Fixes issue #165. Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index a2e87651..ef415d96 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -254,7 +254,7 @@ do_install_append() { echo "" >> $conf echo "# default compiler options which can be overwritten from the environment" >> $conf - echo "isEmpty(QMAKE_AR): QMAKE_AR = ${OE_QMAKE_AR} cqs" >> $conf + echo "count(QMAKE_AR, 1): QMAKE_AR = ${OE_QMAKE_AR} cqs" >> $conf echo "isEmpty(QMAKE_CC): QMAKE_CC = $OE_QMAKE_CC_NO_SYSROOT" >> $conf echo "isEmpty(QMAKE_CXX): QMAKE_CXX = $OE_QMAKE_CXX_NO_SYSROOT" >> $conf # OE_QMAKE_CFLAGS and OE_QMAKE_CXXFLAGS contain path of the build host, which is not useful for the target. -- cgit v1.2.3-54-g00ecf