alien.libraries.finder.linux: some fixes to allow "LLVM-3.4" to find "LLVM-3.4.1".

diff --git a/basis/alien/libraries/finder/linux/linux.factor b/basis/alien/libraries/finder/linux/linux.factor
index 482a55cf032276c408d916dd35c446c5b450d1f5..c2978d1861336857b4580b8135b4d71a98e00e57 100644 (file)
--- a/basis/alien/libraries/finder/linux/linux.factor
+++ b/basis/alien/libraries/finder/linux/linux.factor
@@ -27,15 +27,22 @@ CONSTANT: mach-map {
 : ldconfig-arch ( -- str )
     mach-map cpu of { "libc6" } or ;
 
+: name-matches? ( lib triple -- ? )
+    first swap ?head [ ?first CHAR: . = t ] [ f ] if ;
+
+: arch-matches? ( lib triple -- ? )
+    nip second ldconfig-arch subset? ;
+
 : ldconfig-matches? ( lib triple -- ? )
-    { [ first head? ] [ nip second ldconfig-arch subset? ] } 2&& ;
+    { [ name-matches? ] [ arch-matches? ] } 2&& ;
 
 : ldconfig-find-soname ( lib -- seq )
-    load-ldconfig-cache [ ldconfig-matches? ] with filter [ third ] map ;
+    load-ldconfig-cache [ ldconfig-matches? ] with filter
+    [ third ] map ;
 
 PRIVATE>
 
 M: linux find-library*
-    "lib" ".so" surround ldconfig-find-soname [
+    "lib" prepend ldconfig-find-soname [
         { [ exists? ] [ file-info regular-file? ] } 1&&
     ] map-find nip ;