From cfce1491827e5a581878b5e166bf4d30e6d90e07 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Thu, 23 Jul 2020 00:08:16 -0700 Subject: [PATCH] sql/CMakeLists.txt: fix gen_lex_hash not found Fix the below do_compile issue in cross-compiling env. | make[2]: *** No rule to make target '/build/tmp/work/aarch64-poky-linux/mariadb/10.3.13-r0/mariadb-10.3.13/sql/gen_lex_hash', needed by 'sql/lex_hash.h'. Stop. | make[2]: *** No rule to make target '/build/tmp/work/aarch64-poky-linux/mariadb/10.3.13-r0/mariadb-10.3.13/sql/gen_lex_token', needed by 'sql/lex_token.h'. Stop. Upstream-Status: Inappropriate [oe build specific] Signed-off-by: Mingli Yu --- sql/CMakeLists.txt | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 0dc3caa..616017b 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -52,11 +52,16 @@ ${CMAKE_BINARY_DIR}/sql ${CMAKE_SOURCE_DIR}/tpool ) -ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h - COMMAND gen_lex_token > lex_token.h - DEPENDS gen_lex_token -) +IF(NOT CMAKE_CROSSCOMPILING) + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h + COMMAND gen_lex_token > lex_token.h + DEPENDS gen_lex_token) +ELSE() + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h + COMMAND gen_lex_token > lex_token.h) +ENDIF() ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.yy @@ -345,11 +350,16 @@ IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) ENDIF() -ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h - COMMAND gen_lex_hash > lex_hash.h - DEPENDS gen_lex_hash -) +IF(NOT CMAKE_CROSSCOMPILING) + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h + COMMAND gen_lex_hash > lex_hash.h + DEPENDS gen_lex_hash) +ELSE() + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h + COMMAND gen_lex_hash > lex_hash.h) +ENDIF() MYSQL_ADD_EXECUTABLE(mariadb-tzinfo-to-sql tztime.cc COMPONENT Server) SET_TARGET_PROPERTIES(mariadb-tzinfo-to-sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL") -- 2.17.1