luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-31 04:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'macos-gio-modules' into 'main'

Browse Source 
giomodule: Automatically detect modules on macOS

See merge request GNOME/glib!2848
This commit is contained in:
Philip Withnall 2022-10-14 15:29:04 +00:00
commit 6fab8a8cd9
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gio/giomodule.c
View File

@ -1262,6 +1262,29 @@ get_gio_module_dir (void)
g_free (install_dir); g_free (install_dir);
#else #else
module_dir = g_strdup (GIO_MODULE_DIR); module_dir = g_strdup (GIO_MODULE_DIR);
#ifdef __APPLE__
#include "TargetConditionals.h"
#if TARGET_OS_OSX
#include <dlfcn.h>
{
g_autofree gchar *path = NULL;
g_autofree gchar *possible_dir = NULL;
Dl_info info;
if (dladdr (get_gio_module_dir, &info))
{
/* Gets path to the PREFIX/lib directory */
path = g_path_get_dirname (info.dli_fname);
possible_dir = g_build_filename (path, "gio", "modules", NULL);
if (g_file_test (possible_dir, G_FILE_TEST_IS_DIR))
{
g_free (module_dir);
module_dir = g_steal_pointer (&possible_dir);
}
}
}
#endif
#endif
#endif #endif
} }