diff options
author | Tor Didriksen <tor.didriksen@oracle.com> | 2014-02-25 09:07:44 +0100 |
---|---|---|
committer | Tor Didriksen <tor.didriksen@oracle.com> | 2014-02-25 09:07:44 +0100 |
commit | 3f2b13f979b3edc7d5c83060062aa5331273d918 (patch) | |
tree | 64e245beab2d1a32f26928cb556050849763b951 /scripts/mysql_config.pl.in | |
parent | 6f027d9dfc152a0a3f5825ee1956a40d7b78b6b4 (diff) | |
download | mariadb-git-3f2b13f979b3edc7d5c83060062aa5331273d918.tar.gz |
Bug#18235669 MYSQL_CONFIG TO PROVIDE R FLAG ON SOLARIS
'mysql_config --libs' outputs -L/path/to/library
on SunOS we also want it to output '-R/path/to/library'
in order to find libraries at runtime.
cmake/libutils.cmake:
Add an informational message, to show dependencies on OS libraries.
Diffstat (limited to 'scripts/mysql_config.pl.in')
-rw-r--r-- | scripts/mysql_config.pl.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_config.pl.in b/scripts/mysql_config.pl.in index 78200278833..bced4a16360 100644 --- a/scripts/mysql_config.pl.in +++ b/scripts/mysql_config.pl.in @@ -1,7 +1,7 @@ #!/usr/bin/perl # -*- cperl -*- # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 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 @@ -189,7 +189,7 @@ if ( $^O eq "MSWin32" ) } else { - my $linkpath = "-L$pkglibdir"; + my $linkpath = "-L$pkglibdir @RPATH_OPTION@"; @lib_opts = ($linkpath,"-lmysqlclient"); @lib_r_opts = ($linkpath,"-lmysqlclient_r"); @lib_e_opts = ($linkpath,"-lmysqld"); |