f9c850cc42
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> |
||
|---|---|---|
| .. | ||
| aix-g++ | ||
| aix-g++-64 | ||
| android-clang | ||
| common | ||
| cygwin-g++ | ||
| darwin-g++ | ||
| devices | ||
| dummy | ||
| features | ||
| freebsd-clang | ||
| freebsd-g++ | ||
| haiku-g++ | ||
| hpuxi-g++-64 | ||
| hurd-g++ | ||
| integrity-armv7 | ||
| integrity-armv7-imx6 | ||
| integrity-armv8-rcar | ||
| integrity-x86 | ||
| linux-aarch64-gnu-g++ | ||
| linux-arm-gnueabi-g++ | ||
| linux-clang | ||
| linux-clang-32 | ||
| linux-clang-libc++ | ||
| linux-clang-libc++-32 | ||
| linux-g++ | ||
| linux-g++-32 | ||
| linux-g++-64 | ||
| linux-icc | ||
| linux-icc-32 | ||
| linux-icc-64 | ||
| linux-icc-k1om | ||
| linux-llvm | ||
| linux-lsb-g++ | ||
| lynxos-g++ | ||
| macx-clang | ||
| macx-g++ | ||
| macx-icc | ||
| macx-ios-clang | ||
| macx-tvos-clang | ||
| macx-watchos-clang | ||
| macx-xcode | ||
| modules | ||
| netbsd-g++ | ||
| openbsd-g++ | ||
| qnx-aarch64le-qcc | ||
| qnx-armle-v7-qcc | ||
| qnx-x86-64-qcc | ||
| qnx-x86-qcc | ||
| solaris-cc | ||
| solaris-cc-64 | ||
| solaris-cc-64-stlport | ||
| solaris-cc-stlport | ||
| solaris-g++ | ||
| solaris-g++-64 | ||
| unsupported | ||
| wasm-emscripten | ||
| win32-arm64-msvc | ||
| win32-clang-g++ | ||
| win32-clang-msvc | ||
| win32-g++ | ||
| win32-icc | ||
| win32-icc-k1om | ||
| win32-msvc | ||