diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-02-11 21:19:14 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-02-14 10:35:41 +0000 |
| commit | 6c7b80f6ed7d81738b5a86dff822a3d2f692ddb7 (patch) | |
| tree | d07f8bd47ac747b8b49424c9e5eedc30fb7981e2 /scripts/install-qt.sh | |
| parent | 602a7853fb2fd310df726acb242a7ecaf33c834b (diff) | |
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 <christian.kandeler@qt.io>
Diffstat (limited to 'scripts/install-qt.sh')
| -rwxr-xr-x | scripts/install-qt.sh | 8 |
1 files changed, 6 insertions, 2 deletions
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 |