fix mono set dirs (#48)

koubaa · web-flow · commit 79d6c6792ebc · 2023-01-13T11:52:54.000+01:00
* fix mono set dirs

* fix path
diff --git a/clr_loader/__init__.py b/clr_loader/__init__.py
@@ -70,7 +70,7 @@ def get_mono(
 
     libmono = _maybe_path(libmono)
     if libmono is None:
-        libmono = find_libmono(sgen=sgen)
+        libmono = find_libmono(sgen=sgen, assembly_dir=assembly_dir)
 
     impl = Mono(
         # domain=domain,
diff --git a/clr_loader/mono.py b/clr_loader/mono.py
@@ -136,7 +136,7 @@ def initialize(
         _MONO = load_mono(libmono)
 
         if assembly_dir is not None and config_dir is not None:
-            _MONO.mono_set_dirs(assembly_dir, config_dir)
+            _MONO.mono_set_dirs(assembly_dir.encode("utf8"), config_dir.encode("utf8"))
 
         # Load in global config (i.e /etc/mono/config)
         global_encoded = global_config_file or ffi.NULL
diff --git a/clr_loader/util/find.py b/clr_loader/util/find.py
@@ -105,7 +105,7 @@ def find_runtimes() -> Iterator[DotnetCoreRuntimeSpec]:
         return find_runtimes_in_root(dotnet_root)
 
 
-def find_libmono(*, sgen: bool = True) -> Path:
+def find_libmono(*, assembly_dir: str = None, sgen: bool = True) -> Path:
     """Find a suitable libmono dynamic library
 
     On Windows and macOS, we check the default installation directories.
@@ -137,9 +137,12 @@ def find_libmono(*, sgen: bool = True) -> Path:
         )
 
     else:
-        from ctypes.util import find_library
-
-        path = find_library(unix_name)
+        if assembly_dir == None:
+            from ctypes.util import find_library
+            path = find_library(unix_name)
+        else:
+            libname = "lib" + unix_name + ".so"
+            path = Path(assembly_dir) / "lib" / libname
 
     if path is None:
         raise RuntimeError("Could not find libmono")
