Commit bcee6652 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

Directories with .dylib files added to DYLD_LOIBRARY_PATH to allow plugins to use them.

mysql-test/mysql-test-run.pl:
  Directories added for mac to lybrary search paths.
plugin/handler_socket/libhsclient/Makefile.am:
  Static build of library removed.
parent 8ecdd5e4
...@@ -2051,6 +2051,13 @@ sub environment_setup { ...@@ -2051,6 +2051,13 @@ sub environment_setup {
push(@ld_library_paths, "$basedir/libmysql/.libs/", push(@ld_library_paths, "$basedir/libmysql/.libs/",
"$basedir/libmysql_r/.libs/", "$basedir/libmysql_r/.libs/",
"$basedir/zlib/.libs/"); "$basedir/zlib/.libs/");
if ($^O eq "darwin")
{
# it is MAC OS and we have to add dynamic libraries paths
push @ld_library_paths, grep {<$_/*.dylib>}
(<$bindir/storage/*/.libs/>,<$bindir/plugin/*/.libs/>,
<$bindir/plugin/*/*/.libs/>,<$bindir/storage/*/*/.libs>);
}
} }
else else
{ {
......
...@@ -8,6 +8,5 @@ inst_HEADERS = allocator.hpp config.hpp mutex.hpp string_util.hpp \ ...@@ -8,6 +8,5 @@ inst_HEADERS = allocator.hpp config.hpp mutex.hpp string_util.hpp \
lib_LTLIBRARIES = libhsclient.la lib_LTLIBRARIES = libhsclient.la
libhsclient_la_SOURCES = config.cpp escape.cpp fatal.cpp hstcpcli.cpp \ libhsclient_la_SOURCES = config.cpp escape.cpp fatal.cpp hstcpcli.cpp \
socket.cpp string_util.cpp socket.cpp string_util.cpp
libhsclient_la_LDFLAGS = -static
libhsclient_la_CFLAGS = $(AM_CFLAGS) libhsclient_la_CFLAGS = $(AM_CFLAGS)
libhsclient_la_CXXFLAGS = $(AM_CXXFLAGS) libhsclient_la_CXXFLAGS = $(AM_CXXFLAGS)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment