suzanne.soy/compatibility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dont use get-lib-search-dirs if the input path is absolute

Browse Source 
svn: r3058

original commit: c4e52e3919fd86f38eb3131014cebdf20571ba2e
This commit is contained in:
Eli Barzilay 2006-05-25 16:14:17 +00:00
parent 792f0b5a57
commit daf01359f4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
collects/mzlib/foreign.ss
View File

@ -163,14 +163,17 @@
;; unreliable).
(let* ([version (if (pair? version) (string-append "." (car version)) "")]
[fullpath (lambda (p) (path->complete-path (expand-path p)))]
[name0 (path->string (expand-path name))] ; orig name
[absolute? (absolute-path? name)] ; orig name
[name0 (path->string (expand-path name))]
[name (if (regexp-match lib-suffix-re name0) ; name + suffix
(string-append name0 version)
(string-append name0 "." lib-suffix version))])
(or (ormap (lambda (dir)
(or (ffi-lib (build-path dir name) #t) ; try good name first
(ffi-lib (build-path dir name0) #t))) ; try original
(get-lib-search-dirs))
(or (and absolute?
(ormap (lambda (dir)
;; try good name first, then original
(or (ffi-lib (build-path dir name) #t)
(ffi-lib (build-path dir name0) #t)))
(get-lib-search-dirs)))
;; Try without DLL path:
(ffi-lib name #t) ; try good name first
(ffi-lib name0 #t) ; try original