diff options
Diffstat (limited to 'libmysqlclient/mysql/buildfile')
| -rw-r--r-- | libmysqlclient/mysql/buildfile | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libmysqlclient/mysql/buildfile b/libmysqlclient/mysql/buildfile index cea8d4c..d9273bf 100644 --- a/libmysqlclient/mysql/buildfile +++ b/libmysqlclient/mysql/buildfile @@ -37,9 +37,7 @@ lib{mysqlclient}: {h c }{* -version -config} \ sql/auth/{ hxx }{* } \ sql/auth/{ cxx}{password sha2_password_common} \ sql-common/{ hxx cxx}{* } \ - libmysql/{ hxx cxx}{* -*test*} \ - { def}{libmysql_exports } \ - $imp_libs + libmysql/{ hxx cxx}{* -*test*} lib{mysqlclient}: mysys/cxx{posix_timers}: include = $linux lib{mysqlclient}: mysys/cxx{kqueue_timers}: include = ($bsd || $macos) @@ -48,6 +46,10 @@ lib{mysqlclient}: mysys/{ cxx}{$mysys_win32} \ vio/{ cxx}{$vio_win32 } \ libmysql/authentication_win/{hxx cxx}{* }: include = $windows +lib{mysqlclient}: $imp_libs + +libs{mysqlclient}: def{libmysql_exports}: include = $windows + # Makes sense to distribute READMEs for the bundled libraries. Note that their # licenses are incorporated into the root LICENSE file. # @@ -65,7 +67,7 @@ lib{mysqlclient}: strings/file{README} # Fedora/RHEL: /var/lib/mysql/mysql.sock # Source package: /tmp/mysql.sock # -h{version}: mysql/in{mysql_version} $src_root/manifest +h{version}: in{version} $src_root/manifest { dist = true clean = ($src_root != $out_root) @@ -214,10 +216,10 @@ switch $c.class switch $tclass, $tsys { case 'windows', 'mingw32' - cc.libs += -ladvapi32 + cc.libs += -lws2_32 -ldbghelp -lsecur32 -ladvapi32 case 'windows' - cc.libs += advapi32.lib + cc.libs += advapi32.lib # Note: rest linked via pragmas. case 'linux' { @@ -229,14 +231,14 @@ switch $tclass, $tsys # cc.loptions += -Wl,--no-undefined - cc.libs += -ldl -lpthread -lm -lrt + cc.libs += -ldl -lm -lrt -pthread } case 'bsd' - cc.libs += -lexecinfo -lpthread -lm + cc.libs += -lexecinfo -lm -pthread default - cc.libs += -ldl -lpthread -lm + cc.libs += -ldl -lm -pthread } # Export options. |