diff options
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 8 |
2 files changed, 14 insertions, 4 deletions
@@ -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 diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index e8ce665dfe..11cdc035b8 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2871,6 +2871,12 @@ void Configure::generateCachefile() moduleStream << "QT_SKIP_MODULES += " << skipModules.join(' ') << endl; moduleStream << endl; + moduleStream << "host_build {" << endl; + moduleStream << " QT_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; + moduleStream << "} else {" << endl; + moduleStream << " QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl; + moduleStream << "}" << endl; + if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE") moduleStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl; @@ -3151,10 +3157,8 @@ void Configure::generateQConfigPri() configStream << endl; configStream << "host_build {" << endl; configStream << " QT_ARCH = " << dictionary["QT_HOST_ARCH"] << endl; - configStream << " QT_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; configStream << "} else {" << endl; configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; - configStream << " QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl; if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { // FIXME: add detection configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; |