diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 22:26:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 22:26:58 +0100 |
| commit | cb67dcb6184535349ca4ff3d7c64eba9c63a0688 (patch) | |
| tree | 10d38ccf7fe60d5ea5c866d37292833b77dfcdae /scripts/mysql_config.sh | |
| parent | 44002a34e680c79c01df879b540458c2885e97e8 (diff) | |
| parent | faec0e2f4aecfc902e354ae7af991779d6bfc4a7 (diff) | |
| download | mariadb-git-cb67dcb6184535349ca4ff3d7c64eba9c63a0688.tar.gz | |
mysql-5.5.37 selective merge
Diffstat (limited to 'scripts/mysql_config.sh')
| -rw-r--r-- | scripts/mysql_config.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 81b2e96fbd9..beff6e5eb5f 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -106,10 +106,10 @@ fi # Create options # We intentionally add a space to the beginning and end of lib strings, simplifies replace later -libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" +libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " -libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " -embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " +libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " +embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " if [ -r "$pkglibdir/libmygcc.a" ]; then # When linking against the static library with a different version of GCC |