* ldd.cc (start_process): Handle .oct and .so as DLLs.

This commit is contained in:
Yaakov Selkowitz 2012-01-24 06:29:01 +00:00
parent f171a1e0a6
commit abd9714a7b
2 changed files with 9 additions and 1 deletions

View File

@ -1,3 +1,7 @@
2012-01-24 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
* ldd.cc (start_process): Handle .oct and .so as DLLs.
2011-12-22 Corinna Vinschen <corinna@vinschen.de>
* Makefile.in (ps.exe): Revert previous change.

View File

@ -189,7 +189,11 @@ start_process (const wchar_t *fn, bool& isdll)
PROCESS_INFORMATION pi;
si.cb = sizeof (si);
wchar_t *cmd;
if (wcslen (fn) < 4 || wcscasecmp (wcschr (fn, L'\0') - 4, L".dll") != 0)
/* OCaml natdynlink plugins (.cmxs) cannot be handled by ldd because they
can only be loaded by flexdll_dlopen() */
if (wcslen (fn) < 4 || (wcscasecmp (wcschr (fn, L'\0') - 4, L".dll") != 0
&& wcscasecmp (wcschr (fn, L'\0') - 4, L".oct") != 0
&& wcscasecmp (wcschr (fn, L'\0') - 3, L".so") != 0))
{
cmd = wcsdup (fn);
isdll = false;