From 6c7b80f6ed7d81738b5a86dff822a3d2f692ddb7 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sat, 11 Feb 2023 21:19:14 +0300 Subject: install-qt.sh: fix mingw install dir The installation directory for mingw 9.0 was detected incorrectly which lead to the fact we used the wrong compiler in CI. Change-Id: I4635dde0cf68eacc8436e6393609162e15add418 Reviewed-by: Christian Kandeler --- scripts/install-qt.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh index f1162eb15..4ccad3f8e 100755 --- a/scripts/install-qt.sh +++ b/scripts/install-qt.sh @@ -378,10 +378,14 @@ for COMPONENT in ${COMPONENTS}; do # adjust the PATH variable. echo $(dirname "${CONF_FILE}") elif [[ "${COMPONENT}" =~ "mingw" ]]; then + VERSION_DIR="${VERSION//./}" if [[ "${TOOLCHAIN}" =~ "win64_mingw" ]]; then - echo "${UNPACK_DIR}/Tools/mingw${VERSION//./}_64/bin" + if [[ "${VERSION}" == "9.0.0" ]]; then + VERSION_DIR="1120" + fi + echo "${UNPACK_DIR}/Tools/mingw${VERSION_DIR}_64/bin" elif [[ "${TOOLCHAIN}" =~ "win32_mingw" ]]; then - echo "${UNPACK_DIR}/Tools/mingw${VERSION//./}_32/bin" + echo "${UNPACK_DIR}/Tools/mingw${VERSION_DIR}_32/bin" fi elif [[ "${COMPONENT}" =~ "qtcreator" ]]; then if [ "${HOST_OS}" == "mac_x64" ]; then -- cgit v1.2.3