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-21 11:01:29 +0200 |
| commit | fc7e036b001e89e7ab1d69f062d43c1895ab76da (patch) | |
| tree | 64239024d66ed08ddaa506f6cbed5ef2e0207c0e | |
| parent | 27b560cbf0edba661d4536e5b3ec2f34f625756f (diff) | |
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.
Change-Id: I8e0c757ad13e2acff67827bd9063c493e9d84444
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 3995d2fe81ae6affe9e37cc44e077617b9d480b3)
| -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 557d30cb2..a5209e260 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -645,8 +645,10 @@ function(get_v8_arch result targetArch hostArch) set(${result} "mipsel" PARENT_SCOPE) elseif(hostArch STREQUAL "mipsel64") set(${result} "mipsel" 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 |