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

adjust handling of version numbers with dylib suffix

Browse Source 
svn: r13476

original commit: 20f2e32f99baabf26954091350dbc94f825a11bd
This commit is contained in:
Matthew Flatt 2009-02-06 23:46:29 +00:00
commit f9a3e7205a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
collects/mzlib/foreign.ss
View File

@ -135,6 +135,7 @@
(define lib-suffix (bytes->string/latin-1 (subbytes (system-type 'so-suffix) 1))) (define lib-suffix (bytes->string/latin-1 (subbytes (system-type 'so-suffix) 1)))
(define lib-suffix-re (regexp (string-append "\\." lib-suffix "$"))) (define lib-suffix-re (regexp (string-append "\\." lib-suffix "$")))
(define suffix-before-version? (not (equal? lib-suffix "dylib")))
(provide* (unsafe (rename-out [get-ffi-lib ffi-lib])) (provide* (unsafe (rename-out [get-ffi-lib ffi-lib]))
ffi-lib? ffi-lib-name) ffi-lib? ffi-lib-name)
@ -166,7 +167,10 @@
[name0 (path->string (cleanse-path name))] ; orig name [name0 (path->string (cleanse-path name))] ; orig name
[names (map (if (regexp-match lib-suffix-re name0) ; name+suffix [names (map (if (regexp-match lib-suffix-re name0) ; name+suffix
(lambda (v) (string-append name0 v)) (lambda (v) (string-append name0 v))
(lambda (v) (string-append name0 "." lib-suffix v))) (lambda (v)
(if suffix-before-version?
(string-append name0 "." lib-suffix v)
(string-append name0 v "." lib-suffix))))
versions)] versions)]
[ffi-lib* (lambda (name) (ffi-lib name #t))]) [ffi-lib* (lambda (name) (ffi-lib name #t))])
(or ;; try to look in our library paths first (or ;; try to look in our library paths first