godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #82973 from dsnopek/gdextension-linux-favor-local-symbols 

On Linux, favor local symbols when loading a shared library
This commit is contained in:
Rémi Verschelde 2023-10-10 12:33:06 +02:00
parent b931a6e5ce 7f4e700bf7
commit 49495293c7
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/unix/os_unix.cpp
View File

@ -81,6 +81,10 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#ifndef RTLD_DEEPBIND
#define RTLD_DEEPBIND 0
#endif
#if defined(MACOS_ENABLED) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 28) #if defined(MACOS_ENABLED) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 28)
// Random location for getentropy. Fitting. // Random location for getentropy. Fitting.
#include <sys/random.h> #include <sys/random.h>
@ -646,7 +650,7 @@ Error OS_Unix::open_dynamic_library(const String p_path, void *&p_library_handle
path = get_executable_path().get_base_dir().path_join("../lib").path_join(p_path.get_file()); path = get_executable_path().get_base_dir().path_join("../lib").path_join(p_path.get_file());
} }
p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW); p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW | RTLD_DEEPBIND);
ERR_FAIL_NULL_V_MSG(p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror())); ERR_FAIL_NULL_V_MSG(p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror()));
if (r_resolved_path != nullptr) { if (r_resolved_path != nullptr) {