nuke configure -host-option

in its current form, it was introduced only in 5.7, mostly as a side
effect of -external-hostbindir (which is now handled differently).
it only ever worked for the macOS and MinGW specs, as a side effect of
them supporting -sdk and -device-option (for good reasons), and was
supported only by the unix configure. it's not believed to be really
useful and complicates matters somewhat, so get rid of it again.

should it ever become actually relevant, it can be re-introduced
properly, probably along with a -host-sdk option for macOS.

Change-Id: Ib078469ea39deb821c7b6a8c67fda9e1a95fedf5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 4 insertions, 38 deletions

diff --git a/configure b/configure
index 9f1a3a0412..09966e8e1b 100755
--- a/configure
+++ b/configure
@@ -123,10 +123,7 @@ IFS=$SAVED_IFS
 
 # initialize global variables
 DEVICE_VARS_FILE=.device.vars
-HOST_VARS_FILE=.host.vars
-
 :> "$DEVICE_VARS_FILE"
-:> "$HOST_VARS_FILE"
 
 #-------------------------------------------------------------------------------
 # utility functions
@@ -169,6 +166,9 @@ expandQMakeConf()
         ;;
         *load\(device_config\)*)
             conf_file="$2"
+            if [ -z "$conf_file" ]; then
+                continue
+            fi
             if [ ! -f  "$conf_file" ]; then
                 echo "WARNING: Unable to find file $conf_file" >&2
                 continue
@@ -312,7 +312,7 @@ macSDKify()
 getQMakeConf()
 {
     if [ -z "$specvals" ]; then
-        specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" "$HOST_VARS_FILE" | extractQMakeVariables`
+        specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables`
         if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi
     fi
     getSingleQMakeVariable "$1" "$specvals"
@@ -362,23 +362,6 @@ resolveDeviceMkspec()
 }
 
 #-------------------------------------------------------------------------------
-# Host options
-#-------------------------------------------------------------------------------
-HostVar()
-{
-    case "$1" in
-        set)
-            eq="="
-            ;;
-        *)
-            echo >&2 "BUG: wrong command to HostVar: $1"
-            ;;
-    esac
-
-    echo "$2" "$eq" "$3" >> "$HOST_VARS_FILE"
-}
-
-#-------------------------------------------------------------------------------
 # operating system detection
 #-------------------------------------------------------------------------------
 
@@ -559,7 +542,6 @@ while [ "$#" -gt 0 ]; do
     -xplatform| \
     -device| \
     -device-option| \
-    -host-option| \
     -sdk| \
     -android-sdk| \
     -android-ndk| \
@@ -697,11 +679,6 @@ while [ "$#" -gt 0 ]; do
         DEV_VAL=`echo $VAL | cut -d '=' -f 2-`
         DeviceVar set $DEV_VAR "$DEV_VAL"
         ;;
-    host-option)
-        HOST_VAR=`echo $VAL | cut -d '=' -f 1`
-        HOST_VAL=`echo $VAL | cut -d '=' -f 2-`
-        HostVar set $HOST_VAR "$HOST_VAL"
-        ;;
     optimized-qmake|optimized-tools)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
             CFG_RELEASE_TOOLS="$VAL"
@@ -1581,17 +1558,6 @@ else
 fi
 
 #-------------------------------------------------------------------------------
-# write out host config.
-#-------------------------------------------------------------------------------
-HOST_VARS_OUTFILE="$outpath/mkspecs/qhost.pri"
-if cmp -s "$HOST_VARS_FILE" "$HOST_VARS_OUTFILE"; then
-    rm -f "$HOST_VARS_FILE"
-else
-    mv -f $HOST_VARS_FILE "$HOST_VARS_OUTFILE"
-    HOST_VARS_FILE="$HOST_VARS_OUTFILE"
-fi
-
-#-------------------------------------------------------------------------------
 # run configure tests
 #-------------------------------------------------------------------------------