evanphx / rubinius fork watch download tarball
public
Description: Rubinius, the Ruby VM
Homepage: http://rubini.us
Clone URL: git://github.com/evanphx/rubinius.git
Search Repo: 
Better alternative extension check for FFI on OS X. Closes #583.

* Could have caused a bug in some circumstances so a good warning
  to take care of.
rue (author)
Wed Jun 04 00:44:26 -0700 2008
commit  6f53b0c7fd542b651b17b4f26fd49f334a0a80d8
tree    8369f8a7a721ea94f0081a44d516dfeb3891009d
parent  b5c13152582674a26cb3101aa60b2d90ac0cddbc
0
shotgun/lib/subtend/ffi.c 
...
47
48
49
 
50
51
52
...
61
62
63
64
 
 
65
66
67
 
...
47
48
49
50
51
52
53
...
62
63
64
 
65
66
67
68
69
 
0
@@ -47,6 +47,7 @@ static void* ffi_load_function_from_dso(STATE, const OBJECT library, const OBJEC
0
     const char* suffix    = (const char*) FFI_DSO_EXT;
0
 
0
   #ifdef __APPLE_CC__
0
+    unsigned short tried_other_suffix = FALSE;
0
     try_other_suffix:
0
   #endif
0
 
0
@@ -61,7 +62,8 @@ static void* ffi_load_function_from_dso(STATE, const OBJECT library, const OBJEC
0
     /* This name not found or unable to open. Error in ffi_dlerror(). */
0
     if(!lib) {
0
       #ifdef __APPLE_CC__
0
-        if(suffix != FFI_DSO_ALT_EXT) {
0
+        if(!tried_other_suffix) {
0
+          tried_other_suffix = TRUE;
0
           suffix = FFI_DSO_ALT_EXT;
0
           goto try_other_suffix;
0
         }

Comments

    No one has commented yet.