diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2020-06-10 18:41:59 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 10:41:59 +0200 |
| commit | 6e4e097bc26d33951fedf8399f552ae4a336451e (patch) | |
| tree | f78ec0f28f651e3c2a52bc5918820ad345024c1d /.gitignore | |
| parent | 17a7bafec068d6436f3f6c5ca67b9d6c98b31ef5 (diff) | |
| download | mariadb-git-6e4e097bc26d33951fedf8399f552ae4a336451e.tar.gz | |
cmake: merge_static_libs - correct duplicate assumptions (#1583)
This corrects build failures on ppc64{,le} with the
WITH_EMBEDDED_SERVER option enabled.
MDEV-22641 added an unusual case in which the same object
file in was included twice with a different function
defination. The original cmake/merge_archives_unix.cmake
did not tolerate such eventualities.
So we move to the highest voted answer on Stack Overflow
for the merging of static libraries.
https://stackoverflow.com/questions/3821916/how-to-merge-two-ar-static-libraries-into-one
Thin archives generated compile failures and the libtool
mechanism would of been another dependency and using .la
files that isn't part of a normal cmake output. The straight
Apple mechanism of libtool with static archives also failed
on Linux.
This leaves the MRI script mechansim which was implemented
in this change.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 83ba4b048ad..e38b56e5894 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ .*.swp *.ninja .ninja_* +*.mri +*.mri.tpl .gdb_history .vs/ errmsg.sys |