diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 52 |
1 files changed, 36 insertions, 16 deletions
@@ -4316,8 +4316,7 @@ fi # detect neon support if [ "$CFG_ARCH" = "arm" ] && [ "${CFG_NEON}" = "auto" ]; then - # The iOS toolchain has trouble building the pixman NEON draw-helpers - if [ "$XPLATFORM_IOS" != "yes" ] && compileTest unix/neon "neon"; then + if compileTest unix/neon "neon"; then CFG_NEON=yes else CFG_NEON=no @@ -6208,16 +6207,28 @@ fi # Add compiler sub-architecture support echo "" >>"$outpath/src/corelib/global/qconfig.h.new" echo "// Compiler sub-arch support" >>"$outpath/src/corelib/global/qconfig.h.new" -for SUBARCH in SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2 \ - IWMMXT NEON \ - MIPS_DSP MIPS_DSPR2; do - eval "VAL=\$CFG_$SUBARCH" - case "$VAL" in - yes) - echo "#define QT_COMPILER_SUPPORTS_$SUBARCH" \ - >>"$outpath/src/corelib/global/qconfig.h.new" +for SUBARCH in X86: SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2 : \ + ARM: IWMMXT NEON : \ + MIPS: MIPS_DSP MIPS_DSPR2 : +do + line="" + case $SUBARCH in + :) + line="#endif" + ;; + *:) + line="#ifdef Q_PROCESSOR_$(echo $SUBARCH | sed 's/:$//')" + ;; + *) + eval "VAL=\$CFG_$SUBARCH" + case "$VAL" in + yes) + line=" #define QT_COMPILER_SUPPORTS_$SUBARCH" + ;; + esac ;; esac + [ -n "$line" ] && echo "$line" >>"$outpath/src/corelib/global/qconfig.h.new" done echo "" >>"$outpath/src/corelib/global/qconfig.h.new" @@ -6410,12 +6421,13 @@ fi cat >>"$QTCONFIG.tmp" <<EOF #configuration CONFIG += $QTCONFIG_CONFIG -QT_ARCH = $CFG_ARCH -QT_HOST_ARCH = $CFG_HOST_ARCH -QT_CPU_FEATURES = $CFG_CPUFEATURES -QT_HOST_CPU_FEATURES = $CFG_HOST_CPUFEATURES -QMAKE_DEFAULT_LIBDIRS = `echo "$DEFAULT_LIBDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '` -QMAKE_DEFAULT_INCDIRS = `echo "$DEFAULT_INCDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '` +host_build { + QT_ARCH = $CFG_HOST_ARCH +} else { + QT_ARCH = $CFG_ARCH + QMAKE_DEFAULT_LIBDIRS = `echo "$DEFAULT_LIBDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '` + QMAKE_DEFAULT_INCDIRS = `echo "$DEFAULT_INCDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '` +} QT_EDITION = $Edition QT_CONFIG += $QT_CONFIG @@ -6497,6 +6509,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_ARCH = $CFG_HOST_CPUFEATURES +} else { + QT_CPU_FEATURES.$CFG_ARCH = $CFG_CPUFEATURES +} +EOF + if [ -n "$QT_CFLAGS_PSQL" ]; then echo "QT_CFLAGS_PSQL = $QT_CFLAGS_PSQL" >> "$QTMODULE.tmp" fi |