diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-05-05 15:56:23 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-05-05 17:21:05 +0200 |
| commit | 4f143a88bcb36e94e9edba8a3c5b4a350dcd9bf9 (patch) | |
| tree | 46a98c881feffc6640a13771cef280ccb479c130 | |
| parent | e7701f8db20f9c4f259e4d677e51e4760d336851 (diff) | |
| download | mariadb-git-4f143a88bcb36e94e9edba8a3c5b4a350dcd9bf9.tar.gz | |
Fix of ppc64 by Wladmariadb-10.3.29
| -rw-r--r-- | cmake/libutils.cmake | 2 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index 002d5a4cabc..4112faa341c 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -166,7 +166,7 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE) ENDFOREACH() IF(OSLIBS) LIST(REMOVE_DUPLICATES OSLIBS) - TARGET_LINK_LIBRARIES(${TARGET} ${OSLIBS}) + TARGET_LINK_LIBRARIES(${TARGET} LINK_PRIVATE ${OSLIBS}) ENDIF() # Make the generated dummy source file depended on all static input diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 9880653b2a5..8886d69851b 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -446,9 +446,9 @@ IF(NOT DISABLE_SHARED) # Clean direct output flags, as 2 targets have the same base name # libmysqld SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1) - TARGET_LINK_LIBRARIES(libmysqld ${CRC32_LIBRARY}) + TARGET_LINK_LIBRARIES(libmysqld LINK_PRIVATE ${CRC32_LIBRARY}) SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1) - TARGET_LINK_LIBRARIES(mysqlserver ${CRC32_LIBRARY}) + TARGET_LINK_LIBRARIES(mysqlserver LINK_PRIVATE ${CRC32_LIBRARY}) IF(LIBMYSQLD_SO_EXTRA_LIBS) TARGET_LINK_LIBRARIES(libmysqld ${LIBMYSQLD_SO_EXTRA_LIBS}) ENDIF() |