--- a/build/cmake/config.cmake 2026-10-18 08:00:19.067557608 +0200 +++ b/build/cmake/config.cmake 2026-10-18 08:00:19.061546894 +0200 @@ -129,7 +129,7 @@ function(wx_write_config) set(lib_unicode_suffix u) if(CMAKE_CROSSCOMPILING) set(cross_compiling yes) - set(host_alias ${CMAKE_SYSTEM_NAME}) + set(host_alias ${wxBUILD_HOST_ALIAS}) else() set(cross_compiling no) endif() --- a/build/cmake/functions.cmake 2026-10-18 08:00:19.068671508 +0200 +++ b/build/cmake/functions.cmake 2026-10-18 08:00:19.061692482 +0200 @@ -361,7 +361,7 @@ function(wx_set_target_properties target set(cross_target) if (CMAKE_CROSSCOMPILING) - set(cross_target "-${CMAKE_SYSTEM_NAME}") + set(cross_target "-${wxBUILD_HOST_ALIAS}") endif() set(lib_prefix "lib") --- a/build/cmake/init.cmake 2026-10-18 08:00:19.066433966 +0200 +++ b/build/cmake/init.cmake 2026-10-18 08:00:19.061430585 +0200 @@ -154,6 +154,9 @@ endif() # Build wxBUILD_FILE_ID used for config and setup path #TODO: build different id for WIN32 set(wxBUILD_FILE_ID "${wxBUILD_TOOLKIT}${wxBUILD_WIDGETSET}-") +if(CMAKE_CROSSCOMPILING) + set(wxBUILD_FILE_ID "${wxBUILD_HOST_ALIAS}-${wxBUILD_FILE_ID}") +endif() wx_string_append(wxBUILD_FILE_ID "unicode") if(NOT wxBUILD_SHARED) wx_string_append(wxBUILD_FILE_ID "-static") --- a/build/cmake/options.cmake 2026-10-18 08:00:19.064433987 +0200 +++ b/build/cmake/options.cmake 2026-10-18 08:00:19.061263206 +0200 @@ -67,6 +67,9 @@ if(WIN32) set(wxBUILD_VENDOR "custom" CACHE STRING "Short string identifying your company (used in DLL name)") endif() set(wxBUILD_FLAVOUR "" CACHE STRING "Specify a name to identify the build") +if(CMAKE_CROSSCOMPILING) + set(wxBUILD_HOST_ALIAS "${CMAKE_SYSTEM_NAME}" CACHE STRING "Host triple used in cross library and config names") +endif() mark_as_advanced(wxBUILD_FLAVOUR) wx_option(wxBUILD_OPTIMISE "use speed-optimised C/C++ compiler flags for release build" OFF)