Changeset 12215 in project

Timestamp:

10/20/08 23:28:01 (12 years ago)

Author:

felix winkelmann

Message:

only tries to find/load .so's, when dloading is available

File:

• chicken/trunk/eval.scm (modified) (3 diffs)

chicken/trunk/eval.scm

@@ -916 +916 @@
                    [else
                     (let ([fname2 (##sys#string-append input ##sys#load-dynamic-extension)])
-                      (if (##sys#file-info fname2)
+                      (if (and (##sys#fudge 24) (##sys#file-info fname2)) ; dload?
                           fname2
                           (let ([fname3 (##sys#string-append input source-file-extension)])
@@ -1099 +1099 @@
         (define (check path)
           (let ([p0 (string-append path "/" p)])
-            (and (or (file-exists? (##sys#string-append p0 ##sys#load-dynamic-extension))
+            (and (or (and (##sys#fudge 24) ; dload?
+                          (file-exists? (##sys#string-append p0 ##sys#load-dynamic-extension)))
                      (file-exists? (##sys#string-append p0 source-file-extension)) )
                  p0) ) )
@@ -1463 +1464 @@
       (define (test fname)
         (test2 
-         fname 
-         (if prefer-source
-             (list source-file-extension ##sys#load-dynamic-extension)
-             (list ##sys#load-dynamic-extension source-file-extension) ) ) )
+         fname
+         (cond ((not (##sys#fudge 24)) (list source-file-extension)) ; no dload?
+               (prefer-source (list source-file-extension ##sys#load-dynamic-extension))
+               (else (list ##sys#load-dynamic-extension source-file-extension) ) ) ))
       (or (test fname)
           (let loop ((paths (if repo