| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 1 | From f92f657973997df30afdb0032c88ad3a14ead46b Mon Sep 17 00:00:00 2001 |
| 2 | From: Mingli Yu <mingli.yu@windriver.com> |
| 3 | Date: Fri, 23 Sep 2022 15:48:21 +0800 |
| 4 | Subject: [PATCH] sql/CMakeLists.txt: fix gen_lex_hash not found |
| 5 | |
| 6 | Fix the below do_compile issue in cross-compiling env. |
| 7 | | 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. |
| 8 | | 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. |
| 9 | |
| 10 | Upstream-Status: Inappropriate [oe build specific] |
| 11 | |
| 12 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| 13 | --- |
| 14 | sql/CMakeLists.txt | 30 ++++++++++++++++++++++-------- |
| 15 | 1 file changed, 22 insertions(+), 8 deletions(-) |
| 16 | |
| 17 | diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt |
| 18 | index 241b482..27a3991 100644 |
| 19 | --- a/sql/CMakeLists.txt |
| 20 | +++ b/sql/CMakeLists.txt |
| 21 | @@ -60,11 +60,18 @@ ${CMAKE_BINARY_DIR}/sql |
| 22 | ${CMAKE_SOURCE_DIR}/tpool |
| 23 | ) |
| 24 | |
| 25 | -ADD_CUSTOM_COMMAND( |
| 26 | - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h |
| 27 | - COMMAND gen_lex_token > lex_token.h |
| 28 | - DEPENDS gen_lex_token |
| 29 | +IF(NOT CMAKE_CROSSCOMPILING) |
| 30 | + ADD_CUSTOM_COMMAND( |
| 31 | + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h |
| 32 | + COMMAND gen_lex_token > lex_token.h |
| 33 | + DEPENDS gen_lex_token |
| 34 | +) |
| 35 | +ELSE() |
| 36 | + ADD_CUSTOM_COMMAND( |
| 37 | + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h |
| 38 | + COMMAND gen_lex_token > lex_token.h |
| 39 | ) |
| 40 | +ENDIF() |
| 41 | |
| 42 | FIND_PACKAGE(BISON 2.4) |
| 43 | |
| 44 | @@ -372,11 +379,18 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) |
| 45 | ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) |
| 46 | ENDIF() |
| 47 | |
| 48 | -ADD_CUSTOM_COMMAND( |
| 49 | - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h |
| 50 | - COMMAND gen_lex_hash > lex_hash.h |
| 51 | - DEPENDS gen_lex_hash |
| 52 | +IF(NOT CMAKE_CROSSCOMPILING) |
| 53 | + ADD_CUSTOM_COMMAND( |
| 54 | + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h |
| 55 | + COMMAND gen_lex_hash > lex_hash.h |
| 56 | + DEPENDS gen_lex_hash |
| 57 | +) |
| 58 | +ELSE() |
| 59 | + ADD_CUSTOM_COMMAND( |
| 60 | + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h |
| 61 | + COMMAND gen_lex_hash > lex_hash.h |
| 62 | ) |
| 63 | +ENDIF() |
| 64 | |
| 65 | MYSQL_ADD_EXECUTABLE(mariadb-tzinfo-to-sql tztime.cc) |
| 66 | SET_TARGET_PROPERTIES(mariadb-tzinfo-to-sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL") |
| 67 | -- |
| 68 | 2.25.1 |
| 69 | |