From 002b2ce29feeb02ebaa3066d11bfd9e541034e0b Mon Sep 17 00:00:00 2001 From: Jeroen Hofstee Date: Sun, 5 Dec 2021 14:50:52 +0100 Subject: [PATCH] sdk: fix compiler location for QT6_INSTALL_BINDIR != bindir If QT6_INSTALL_BINDIR is set to a different value than bindir, the compiler cannot be found, since it is typically installed in bindir. So point to bindir by default instead. Pick-to: 6.2 Change-Id: I3bb94c2daf97f1b2500560fdcc4304cba9699ab5 Reviewed-by: Samuli Piippo --- classes/populate_sdk_qt6_base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass index ebbe711..8ef2fb1 100644 --- a/classes/populate_sdk_qt6_base.bbclass +++ b/classes/populate_sdk_qt6_base.bbclass @@ -69,7 +69,7 @@ create_qt6_sdk_files () { echo "isEmpty(QMAKE_LFLAGS): QMAKE_LFLAGS = ${LDFLAGS}" >> $mkspec sed -i $mkspec \ -e 's:${RECIPE_SYSROOT}:$$[QT_SYSROOT]:' \ - -e 's:${TARGET_PREFIX}:$$[QT_HOST_BINS]/${TARGET_SYS}/${TARGET_PREFIX}:' + -e 's:${TARGET_PREFIX}:$$[QT_HOST_PREFIX]${bindir}/${TARGET_SYS}/${TARGET_PREFIX}:' # Generate a toolchain file for using Qt without running setup-environment script cat > ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake <