1 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure
index a965054c9a..cf72e2ba39 100755
--- a/configure
+++ b/configure
@@ -6413,10 +6413,8 @@ cat >>"$QTCONFIG.tmp" <<EOF
 CONFIG += $QTCONFIG_CONFIG
 host_build {
     QT_ARCH = $CFG_HOST_ARCH
-    QT_CPU_FEATURES = $CFG_HOST_CPUFEATURES
 } else {
     QT_ARCH = $CFG_ARCH
-    QT_CPU_FEATURES = $CFG_CPUFEATURES
     QMAKE_DEFAULT_LIBDIRS = `echo "$DEFAULT_LIBDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '`
     QMAKE_DEFAULT_INCDIRS = `echo "$DEFAULT_INCDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '`
 }
@@ -6501,6 +6499,14 @@ if [ -n "$CFG_SKIP_MODULES" ]; then
     echo "QT_SKIP_MODULES += $CFG_SKIP_MODULES" >> "$QTMODULE.tmp"
 fi
 
+cat >>"$QTMODULE.tmp" <<EOF
+host_build {
+    QT_CPU_FEATURES = $CFG_HOST_CPUFEATURES
+} else {
+    QT_CPU_FEATURES = $CFG_CPUFEATURES
+}
+EOF
+
 if [ -n "$QT_CFLAGS_PSQL" ]; then
     echo "QT_CFLAGS_PSQL   = $QT_CFLAGS_PSQL" >> "$QTMODULE.tmp"
 fi