[svn:parrot] r39337 - in trunk: runtime/parrot/library src

[NotFound at svn.parrot.org]

Author: NotFound
Date: Tue Jun  2 16:50:55 2009
New Revision: 39337
URL: https://trac.parrot.org/parrot/changeset/39337

Log:
[core] quick-fix libtcl loading

Modified:
   trunk/runtime/parrot/library/TclLibrary.pir
   trunk/src/dynext.c

Modified: trunk/runtime/parrot/library/TclLibrary.pir
==============================================================================
--- trunk/runtime/parrot/library/TclLibrary.pir	Tue Jun  2 15:29:33 2009	(r39336)
+++ trunk/runtime/parrot/library/TclLibrary.pir	Tue Jun  2 16:50:55 2009	(r39337)
@@ -204,6 +204,8 @@
     push libnames, 'tcl84'
     push libnames, 'libtcl8.5'
     push libnames, 'libtcl8.4'
+    push libnames, 'libtcl8.5.so'
+    push libnames, 'libtcl8.4.so'
 standard_names_e:
 
     .local pmc libtcl

Modified: trunk/src/dynext.c
==============================================================================
--- trunk/src/dynext.c	Tue Jun  2 15:29:33 2009	(r39336)
+++ trunk/src/dynext.c	Tue Jun  2 16:50:55 2009	(r39337)
@@ -352,6 +352,14 @@
             return path;
     }
 #endif
+
+    /* And after-finally,  let the OS use his own search */
+    if (!STRING_IS_EMPTY(lib)) {
+        *handle = dlopen_string(interp, lib);
+        if (*handle)
+            return lib;
+    }
+
     err = Parrot_dlerror();
     Parrot_warn(interp, PARROT_WARNINGS_DYNEXT_FLAG,
                 "Couldn't load '%Ss': %s\n",