Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
4f143a88
Commit
4f143a88
authored
May 05, 2021
by
Oleksandr Byelkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix of ppc64 by Wlad
parent
e7701f8d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
cmake/libutils.cmake
cmake/libutils.cmake
+1
-1
libmysqld/CMakeLists.txt
libmysqld/CMakeLists.txt
+2
-2
No files found.
cmake/libutils.cmake
View file @
4f143a88
...
...
@@ -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
...
...
libmysqld/CMakeLists.txt
View file @
4f143a88
...
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment