From 6f6fa3bec2decb26598bce33d43594aabb25b201 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Tue, 21 Feb 2023 12:04:45 +0200 Subject: MDEV-30694: Cross building on x86_64 to arch i686 fails Currently cross compilation on x86_64 to arch i686 fails with error: > ctype-uca1400data.h /bin/sh: 1: uca-dump: not found Commit makes sure that uca-dump is treated correctly when cross compiling MariaDB to another architecture --- strings/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'strings') diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt index c332937ac94..85e8cd05816 100644 --- a/strings/CMakeLists.txt +++ b/strings/CMakeLists.txt @@ -41,7 +41,9 @@ ADD_EXECUTABLE(conf_to_src EXCLUDE_FROM_ALL conf_to_src.c) SET_TARGET_PROPERTIES(conf_to_src PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE) TARGET_LINK_LIBRARIES(conf_to_src mysys strings) -ADD_EXECUTABLE(uca-dump uca-dump.c) +IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) + ADD_EXECUTABLE(uca-dump uca-dump.c) +ENDIF() ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ctype-uca1400data.h -- cgit v1.2.1