diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2023-02-21 12:04:45 +0200 |
|---|---|---|
| committer | Andrew Hutchings <andrew@linuxjedi.co.uk> | 2023-02-22 16:01:46 +0000 |
| commit | 6f6fa3bec2decb26598bce33d43594aabb25b201 (patch) | |
| tree | 37a0e0a48f594c07b715e2d2d21c80eb7d7349c9 /strings | |
| parent | 33f8f92b7426fc05e5405cdacf93c7709329eb6f (diff) | |
| download | mariadb-git-6f6fa3bec2decb26598bce33d43594aabb25b201.tar.gz | |
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
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
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 |