From 4866733a7456aa8c88a9731b4f2f1d50881f935a Mon Sep 17 00:00:00 2001
From: Robin Hübner
Date: Sat, 28 Apr 2018 14:36:35 +0200
Subject: GDNative Unix: fix shared lib loading, dlopen expects leading ./ to
 interpret as relative path.

(cherry picked from commit 828744195526e44a30d07c232db25066cf0fc984)
---
 drivers/unix/os_unix.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'drivers/unix/os_unix.cpp')

diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index aa01f2267..dfa57a3fb 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -357,6 +357,12 @@ Error OS_Unix::open_dynamic_library(const String p_path, void *&p_library_handle
 
 	String path = p_path;
 
+	if (FileAccess::exists(path) && path.is_rel_path()) {
+		// dlopen expects a slash, in this case a leading ./ for it to be interpreted as a relative path,
+		//  otherwise it will end up searching various system directories for the lib instead and finally failing.
+		path = "./" + path;
+	}
+
 	if (!FileAccess::exists(path)) {
 		//this code exists so gdnative can load .so files from within the executable path
 		path = get_executable_path().get_base_dir().plus_file(p_path.get_file());
-- 
cgit v1.2.3-70-g09d2