try local dll BEFORE package dll.
authorClaus Gittinger <cg@exept.de>
Wed, 14 Mar 2007 20:53:31 +0100
changeset 10451 cb5c7b091764
parent 10450 bb40b56ed6b6
child 10452 2f486960b688
try local dll BEFORE package dll.
Smalltalk.st
--- a/Smalltalk.st	Wed Mar 14 18:55:29 2007 +0100
+++ b/Smalltalk.st	Wed Mar 14 20:53:31 2007 +0100
@@ -602,7 +602,6 @@
     Stdout reOpen. Stderr reOpen. Stdin reOpen.
 ! !
 
-
 !Smalltalk class methodsFor:'Compatibility-Squeak'!
 
 beep
@@ -4795,16 +4794,20 @@
              the sharedLib extension (.dll / .so / .sl) is added here, to
              make the caller independent of the underlying operatingSystem."
 
-    |path fn|
+    |path baseName handle|
 
     ObjectFileLoader isNil ifTrue:[^ false].
 
-    fn := aClassLibraryName asFilename withSuffix:(ObjectFileLoader sharedLibrarySuffix).
-    fn := fn pathName.
+    baseName := aClassLibraryName asFilename withSuffix:(ObjectFileLoader sharedLibrarySuffix).
+    baseName exists ifTrue:[
+        "/ load local file first...
+        handle := (ObjectFileLoader loadObjectFile:baseName).
+        handle notNil ifTrue:[^ true].
+    ].
 
     path := self getPackageDirectoryForPackage:packageID.
     path isNil ifTrue:[^ false].
-    path := path asFilename construct:fn.
+    path := path asFilename construct:baseName.
     path exists ifFalse:[^ false].
 
     ^ (ObjectFileLoader loadObjectFile:path pathName) notNil
@@ -6977,5 +6980,5 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.814 2007-03-05 12:33:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.815 2007-03-14 19:53:31 cg Exp $'
 ! !