diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | mkspecs/features/simd.prf | 3 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -6501,9 +6501,9 @@ fi cat >>"$QTMODULE.tmp" <<EOF host_build { - QT_CPU_FEATURES = $CFG_HOST_CPUFEATURES + QT_CPU_FEATURES.$CFG_HOST_ARCH = $CFG_HOST_CPUFEATURES } else { - QT_CPU_FEATURES = $CFG_CPUFEATURES + QT_CPU_FEATURES.$CFG_ARCH = $CFG_CPUFEATURES } EOF diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf index b430e59ff0..751f836a2d 100644 --- a/mkspecs/features/simd.prf +++ b/mkspecs/features/simd.prf @@ -12,6 +12,9 @@ # Get the SIMD flags load(qt_build_config) +# Set QT_CPU_FEATURES for convenience +QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH) + # # Set up compilers for SIMD (SSE/AVX, NEON etc) # diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 11cdc035b8..54c262ff20 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2872,9 +2872,11 @@ void Configure::generateCachefile() moduleStream << endl; moduleStream << "host_build {" << endl; - moduleStream << " QT_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; + moduleStream << " QT_CPU_FEATURES." << dictionary["QT_HOST_ARCH"] << + " = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; moduleStream << "} else {" << endl; - moduleStream << " QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl; + moduleStream << " QT_CPU_FEATURES." << dictionary["QT_ARCH"] << + " = " << dictionary["QT_CPU_FEATURES"] << endl; moduleStream << "}" << endl; if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE") |