diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2022-07-27 07:32:24 +0300 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2022-07-27 17:19:31 +0000 |
commit | d91ea75aacfe5763967a6485cb74e6818ba67f44 (patch) | |
tree | 947b9461533cd177ee932d965a6149feb0aaecdf | |
parent | 07f6f47cc6bdf2cec3a88c3a3674c83cecad7fce (diff) | |
download | qbs-d91ea75aacfe5763967a6485cb74e6818ba67f44.tar.gz |
Fix install-qt.sh
The condition should not affect ios
This amends 59e983d5d998d62930e590264ff70314b84f3a90.
Change-Id: I6c1912d43d455188476976712be0a6b4989e128a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rwxr-xr-x | scripts/install-qt.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh index 8af82ccbc..2cc895e07 100755 --- a/scripts/install-qt.sh +++ b/scripts/install-qt.sh @@ -89,7 +89,7 @@ Options android any, android_armv7, android_arm64_v8a desktop - clang_64 (default), + clang_64 (default) ios ios @@ -348,7 +348,7 @@ for COMPONENT in ${COMPONENTS}; do SUBDIR="${TOOLCHAIN/win32_/}" elif [[ "${TOOLCHAIN}" =~ "any" ]] && [[ "${TARGET_PLATFORM}" == "android" ]]; then SUBDIR="android" - elif [ "${HOST_OS}" == "mac_x64" ] && [ ! "${VERSION}" \< "6.1.2" ]; then + elif [[ "${HOST_OS}" == "mac_x64" ]] && [[ ! "${VERSION}" < "6.1.2" ]] && [[ "${TARGET_PLATFORM}" == "desktop" ]]; then SUBDIR="macos" else SUBDIR="${TOOLCHAIN}" |