Add link libraries directories

nmariz · nmariz · commit dc4db59fcf24 · 2019-06-12T21:20:45.000+01:00
diff --git a/lib/cpy_distutils.py b/lib/cpy_distutils.py
@@ -389,9 +389,7 @@ def _get_posix_openssl_libs(self):
         return openssl_libs
 
     def _copy_vendor_libraries(self):
-        is_wheel = getattr(self.distribution.get_command_obj("install"),
-                           "is_wheel", False)
-        if not self.with_mysql_capi or not is_wheel:
+        if not self.with_mysql_capi:
             return
 
         log.info("Copying vendor files")
@@ -671,6 +669,13 @@ def fix_compiler(self):
             if self.extra_link_args and ext.name == "_mysql_connector":
                 extra_link_args = self.extra_link_args.split()
                 if platform.system() == "Linux":
+                    mysql_config = self.with_mysql_capi \
+                        if not os.path.isdir(self.with_mysql_capi) \
+                        else os.path.join(self.with_mysql_capi, "bin", "mysql_config")
+                    mysql_info = mysql_c_api_info(mysql_config)
+                    extra_link_args.extend(
+                        ["-L{0}".format(lib)
+                         for lib in mysql_info["link_directories"]])
                     extra_link_args += ["-Wl,-rpath,$ORIGIN/mysql-vendor"]
                 ext.extra_link_args.extend(extra_link_args)
             # Add system headers
diff --git a/unittests.py b/unittests.py
@@ -849,7 +849,7 @@ def main():
                                 options.extra_compile_args,
                                 options.extra_link_args, options.debug)
 
-        if platform.system() == "Darwin" and tests.MYSQL_VERSION > (8, 0, 5):
+        if platform.system() in ("Darwin", "Linux") and tests.MYSQL_VERSION > (8, 0, 5):
             shutil.copytree(os.path.join(_TOPDIR, "mysql-vendor"),
                             os.path.join(tests.TEST_BUILD_DIR, "mysql-vendor"))
 
