Commit 55b47649 authored by James Le Cuirot's avatar James Le Cuirot

MDEV-6579: Properly handle gen_pfs_lex_token when cross-compiling

parent fd4a4b8f
...@@ -468,7 +468,7 @@ ADD_SUBDIRECTORY(packaging/solaris) ...@@ -468,7 +468,7 @@ ADD_SUBDIRECTORY(packaging/solaris)
IF(NOT CMAKE_CROSSCOMPILING) IF(NOT CMAKE_CROSSCOMPILING)
SET(EXPORTED comp_err comp_sql factorial) SET(EXPORTED comp_err comp_sql factorial)
IF(NOT WITHOUT_SERVER) IF(NOT WITHOUT_SERVER)
SET(EXPORTED ${EXPORTED} gen_lex_hash) SET(EXPORTED ${EXPORTED} gen_lex_hash gen_pfs_lex_token)
ENDIF() ENDIF()
# minimal target to build only binaries for export # minimal target to build only binaries for export
ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED}) ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
......
...@@ -22,9 +22,11 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ...@@ -22,9 +22,11 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}
ADD_DEFINITIONS(-DMYSQL_SERVER) ADD_DEFINITIONS(-DMYSQL_SERVER)
# Gen_pfs_lex_token # Gen_pfs_lex_token
ADD_EXECUTABLE(gen_pfs_lex_token gen_pfs_lex_token.cc) IF(NOT CMAKE_CROSSCOMPILING)
# gen_pfs_lex_token itself depends on ${CMAKE_CURRENT_BINARY_DIR}/sql/sql_yacc.h ADD_EXECUTABLE(gen_pfs_lex_token gen_pfs_lex_token.cc)
ADD_DEPENDENCIES(gen_pfs_lex_token GenServerSource) # gen_pfs_lex_token itself depends on ${CMAKE_CURRENT_BINARY_DIR}/sql/sql_yacc.h
ADD_DEPENDENCIES(gen_pfs_lex_token GenServerSource)
ENDIF()
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pfs_lex_token.h OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pfs_lex_token.h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment