Skip to content

Commit

Permalink
MDEV-30694: Cross building on x86_64 to arch i686 fails
Browse files Browse the repository at this point in the history
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
  • Loading branch information
helmutg authored and LinuxJedi committed Feb 22, 2023
1 parent 33f8f92 commit 6f6fa3b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -483,7 +483,7 @@ ADD_SUBDIRECTORY(support-files)
ADD_SUBDIRECTORY(extra/aws_sdk)

IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
SET(EXPORTED comp_err comp_sql factorial)
SET(EXPORTED comp_err comp_sql factorial uca-dump)
IF(NOT WITHOUT_SERVER)
SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
ENDIF()
Expand Down
4 changes: 3 additions & 1 deletion strings/CMakeLists.txt
Expand Up @@ -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
Expand Down

0 comments on commit 6f6fa3b

Please sign in to comment.