From f190ce004c8fe2094cdbd0dd8a44bbaffa079263 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Fri, 14 Aug 2020 20:30:20 -0400 Subject: [PATCH 07/18] Link libgcc & libstdc++ statically for codgen binaries Makes it easier for cross compilation --- sql/CMakeLists.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 0a954c07411..b0ff4d14cbd 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -71,6 +71,10 @@ MYSQL_ADD_EXECUTABLE(gen_lex_token DEPENDENCIES GenServerSource SKIP_INSTALL ) +IF(MY_COMPILER_IS_GNU) + SET_TARGET_PROPERTIES(gen_lex_token + PROPERTIES LINK_FLAGS "-static-libgcc -static-libstdc++") +ENDIF() MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_MISSING_PROFILE) IF(HAS_MISSING_PROFILE) @@ -94,6 +98,11 @@ MYSQL_ADD_EXECUTABLE(gen_keyword_list LINK_LIBRARIES ${ICU_LIBRARIES} ${CMAKE_DL_LIBS} SKIP_INSTALL ) +IF(MY_COMPILER_IS_GNU) + SET_TARGET_PROPERTIES(gen_keyword_list + PROPERTIES LINK_FLAGS "-static-libgcc -static-libstdc++") +ENDIF() + IF(WITH_LTO OR CMAKE_COMPILER_FLAG_WITH_LTO) TARGET_COMPILE_OPTIONS(gen_keyword_list PRIVATE "-fno-lto") @@ -1316,6 +1325,10 @@ SET_SOURCE_FILES_PROPERTIES( # Gen_lex_hash MYSQL_ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc SKIP_INSTALL) +IF(MY_COMPILER_IS_GNU) + SET_TARGET_PROPERTIES(gen_lex_hash + PROPERTIES LINK_FLAGS "-static-libgcc -static-libstdc++") +ENDIF() IF(HAS_MISSING_PROFILE) ADD_COMPILE_FLAGS( -- 2.33.1