diff options
| author | Rolf Eike Beer <eb@emlix.com> | 2022-09-08 09:09:41 +0200 |
|---|---|---|
| committer | Rolf Eike Beer <eb@emlix.com> | 2022-09-15 16:44:10 +0200 |
| commit | 3995d2fe81ae6affe9e37cc44e077617b9d480b3 (patch) | |
| tree | 7ff8fd0bb9d19aa83d806db6657095a949d93864 /cmake | |
| parent | 76194cd256708a9595f9254da1697ae6c521ddfa (diff) | |
| download | qtwebengine-3995d2fe81ae6affe9e37cc44e077617b9d480b3.tar.gz | |
CMake: accept known valid 32 bit host architectures
When trying to cross-build from one 32 bit host architecture to another the
"Unsupported architecture:" case was hit, in which case the result of
get_v8_arch() was empty. This would lead to configure_gn_toolchain() being
called with a missing argument, which gave a totally unhelpful error message.
Fix this by just accepting valid 32 bit architectures from the internal list,
and raise the debug message to a FATAL_ERROR to get immediate feedback.
Pick-to: 6.4 6.3
Change-Id: I8e0c757ad13e2acff67827bd9063c493e9d84444
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Functions.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 8e06ff34c..e2ccdd9f1 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -654,8 +654,10 @@ function(get_v8_arch result targetArch hostArch) set(${result} "mipsel" PARENT_SCOPE) elseif(hostArch STREQUAL "riscv64") set(${result} "riscv64" PARENT_SCOPE) + elseif(hostArch IN_LIST list32) + set(${result} "${hostArch}" PARENT_SCOPE) else() - message(DEBUG "Unsupported architecture: ${hostArch}") + message(FATAL_ERROR "Unsupported architecture: ${hostArch}") endif() else() # assume 64bit target which matches 64bit host |