Skip to content

Commit 6f6fa3b

Browse files
helmutgLinuxJedi
authored andcommitted
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
1 parent 33f8f92 commit 6f6fa3b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ ADD_SUBDIRECTORY(support-files)
483483
ADD_SUBDIRECTORY(extra/aws_sdk)
484484

485485
IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
486-
SET(EXPORTED comp_err comp_sql factorial)
486+
SET(EXPORTED comp_err comp_sql factorial uca-dump)
487487
IF(NOT WITHOUT_SERVER)
488488
SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
489489
ENDIF()

strings/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ ADD_EXECUTABLE(conf_to_src EXCLUDE_FROM_ALL conf_to_src.c)
4141
SET_TARGET_PROPERTIES(conf_to_src PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
4242
TARGET_LINK_LIBRARIES(conf_to_src mysys strings)
4343

44-
ADD_EXECUTABLE(uca-dump uca-dump.c)
44+
IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
45+
ADD_EXECUTABLE(uca-dump uca-dump.c)
46+
ENDIF()
4547

4648
ADD_CUSTOM_COMMAND(
4749
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ctype-uca1400data.h

0 commit comments

Comments
 (0)