qt5base-lts/mkspecs
Tor Arne Vestbø f9c850cc42 qmake: Pick default architecture on macOS based on uname
When dealing with a universal build of Qt, we would end up
using the QT_ARCH as the architecture for user projects,
but this architecture is always the primary one that Qt
was configured with.

Instead of relying on QT_ARCH, we start writing QT_ARCHS
(plural) to qconfig.pri, based on CMAKE_OSX_ARCHITECTURES,
and then use that to initialize QMAKE_APPLE_DEVICE_ARCHS.

We then resolve the active arch using uname -m, matching
what CMake does.

We still feed all the available architectures to the
Makefile or Xcode project, so that the user can build
for any of the available architectures without needing
a reconfigure.

Fixes: QTBUG-93760
Change-Id: I0d338241ba4d944ca36d85371e9c4df7dbc4f269
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-21 17:45:28 +00:00
..
aix-g++
aix-g++-64
android-clang Change android target SDK version to 29 2020-11-26 20:05:41 +01:00
common Cleanup leftover QWS 2021-04-14 13:00:12 +09:00
cygwin-g++
darwin-g++ Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
devices Add ; to Q_UNUSED 2020-07-07 11:51:48 +02:00
dummy
features qmake: Pick default architecture on macOS based on uname 2021-05-21 17:45:28 +00:00
freebsd-clang make mkspecs not mess up library and include search paths 2017-05-31 12:57:09 +00:00
freebsd-g++ make mkspecs not mess up library and include search paths 2017-05-31 12:57:09 +00:00
haiku-g++ Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
hpuxi-g++-64 Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
hurd-g++ Add <features.h> include to hurd-g++ mkspec 2019-02-14 14:24:56 +00:00
integrity-armv7 integrity: don't mess with QTPLUGIN.platforms 2018-11-21 23:08:10 +00:00
integrity-armv7-imx6 integrity: don't mess with QTPLUGIN.platforms 2018-11-21 23:08:10 +00:00
integrity-armv8-rcar integrity: don't mess with QTPLUGIN.platforms 2018-11-21 23:08:10 +00:00
integrity-x86 integrity: don't mess with QTPLUGIN.platforms 2018-11-21 23:08:10 +00:00
linux-aarch64-gnu-g++ Add new mkspec for cross-compiling Qt5 for AArch64 2017-03-31 00:34:48 +00:00
linux-arm-gnueabi-g++
linux-clang Remove checks for glibc < 2 from qplatformdefs.h files 2020-04-23 06:41:32 +02:00
linux-clang-32 add mkspecs for linux clang 32 2018-08-31 05:34:46 +00:00
linux-clang-libc++
linux-clang-libc++-32 add mkspecs for linux clang 32 2018-08-31 05:34:46 +00:00
linux-g++ Remove checks for glibc < 2 from qplatformdefs.h files 2020-04-23 06:41:32 +02:00
linux-g++-32
linux-g++-64
linux-icc qmake: Stop using -isystem flag 2020-06-06 09:53:59 +00:00
linux-icc-32
linux-icc-64
linux-icc-k1om
linux-llvm Remove checks for glibc < 2 from qplatformdefs.h files 2020-04-23 06:41:32 +02:00
linux-lsb-g++ Remove checks for glibc < 2 from qplatformdefs.h files 2020-04-23 06:41:32 +02:00
lynxos-g++ Remove checks for glibc < 2 from qplatformdefs.h files 2020-04-23 06:41:32 +02:00
macx-clang Remove -qt-xcb, -system-xcb from README and comments 2020-05-19 06:42:35 +00:00
macx-g++ Remove CFBundleGetInfoString from Info.plist templates 2019-10-04 13:09:34 +00:00
macx-icc Remove CFBundleGetInfoString from Info.plist templates 2019-10-04 13:09:34 +00:00
macx-ios-clang Bump Apple platform minimum versions 2021-03-10 23:39:45 +01:00
macx-tvos-clang Bump Apple platform minimum versions 2021-03-10 23:39:45 +01:00
macx-watchos-clang Bump Apple platform minimum versions 2021-03-10 23:39:45 +01:00
macx-xcode Xcode: Disable GPU frame capture and Metal API validation by default 2019-12-18 19:16:09 +01:00
modules
netbsd-g++ make mkspecs not mess up library and include search paths 2017-05-31 12:57:09 +00:00
openbsd-g++ make mkspecs not mess up library and include search paths 2017-05-31 12:57:09 +00:00
qnx-aarch64le-qcc Enable stack-protector-strong for QNX 7.0.0 2017-06-13 14:01:24 +00:00
qnx-armle-v7-qcc
qnx-x86-64-qcc Enable stack-protector-strong for QNX 7.0.0 2017-06-13 14:01:24 +00:00
qnx-x86-qcc
solaris-cc Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
solaris-cc-64 Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
solaris-cc-64-stlport
solaris-cc-stlport
solaris-g++ Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
solaris-g++-64 Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
unsupported Cleanup leftover QWS 2021-04-14 13:00:12 +09:00
wasm-emscripten wasm: add cmake build support 2021-04-01 19:23:42 +10:00
win32-arm64-msvc rename win32-arm64-msvc2017 to win32-arm64-msvc 2020-10-09 08:06:29 +02:00
win32-clang-g++ Clang: use -Oz instead of -O1 to optimize for size 2019-03-21 23:46:32 +00:00
win32-clang-msvc QRandom: add support for RDSEED 2019-10-09 07:31:28 -07:00
win32-g++ qmake: Do not pass -mthreads to Clang 2020-08-28 12:58:04 +03:00
win32-icc Add new AVX512 extensions found in Intel CLX, ICL and ICX processors 2020-02-03 11:31:49 -07:00
win32-icc-k1om
win32-msvc unify windows mkspecs: define c++ flags explicitly 2018-02-22 18:45:15 +00:00