summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure20
1 files changed, 16 insertions, 4 deletions
diff --git a/configure b/configure
index 7251e8e673..bef47d29f1 100755
--- a/configure
+++ b/configure
@@ -2697,6 +2697,8 @@ MacOS/iOS options:
link tools against those frameworks.
-no-framework ...... Do not build Qt as a series of frameworks.
+ -secure-transport .. Use SecureTransport instead of OpenSSL (requires -no-openssl)
+
-sdk <sdk> ......... Build Qt using Apple provided SDK <sdk>. The argument should be
one of the available SDKs as listed by 'xcodebuild -showsdks'.
Note that the argument applies only to Qt libraries and applications built
@@ -2963,11 +2965,21 @@ if [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ];
EditionString="Technology Preview"
elif [ $COMMERCIAL_USER = "yes" ]; then
if [ $UNAME_SYSTEM = "Linux" ]; then
- if file -L /bin/sh | grep -q "64-bit" ; then
- Licheck=licheck64
- else
+ case "$PLATFORM" in
+ *-32)
Licheck=licheck32
- fi
+ ;;
+ *-64)
+ Licheck=licheck64
+ ;;
+ *)
+ if file -L /bin/sh | grep -q "64-bit" ; then
+ Licheck=licheck64
+ else
+ Licheck=licheck32
+ fi
+ ;;
+ esac
elif [ $UNAME_SYSTEM = "Darwin" ]; then
Licheck=licheck_mac
else