linux crash fix.

dmitriyse · Nov 2, 2016 · 34a0aa5 · 34a0aa5
1 parent b89dd3c
commit 34a0aa5
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -4,7 +4,7 @@
 #if (UCS4)
 using System.Text;
 using Mono.Unix;
-
+using Mono.Unix.Native;
 #endif
 
 #if (UCS2 && (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35))
@@ -217,8 +217,8 @@ public class Runtime
         internal static bool IsFinalizing = false;
 
         internal static bool wrap_exceptions;
-        internal static bool is32bit;
-
+        internal static bool is32bit;
+
 #if MONO_LINUX
         internal static void MakeLibSymLink(List<string> seachPathes)
         {
@@ -243,8 +243,15 @@ internal static void MakeLibSymLink(List<string> seachPathes)
                         File.Delete(localLibFile);
                     }
 
-                    UnixFileInfo libFileInfo = new UnixFileInfo(foundLibFullPath);
-                    libFileInfo.CreateSymbolicLink(localLibFile);
+                    int result = Syscall.symlink(foundLibFullPath, localLibFile);
+                    if (result == -1)
+                    {
+                         // do nothing
+                    }
+
+                    // This approach crashes mono. At least it's unsafe to use those methods in AssemblyResolve.
+                    //UnixFileInfo libFileInfo = new UnixFileInfo(foundLibFullPath);
+                    //libFileInfo.CreateSymbolicLink(localLibFile);
                 }
             }
             catch (Exception ex)
@@ -253,9 +260,9 @@ internal static void MakeLibSymLink(List<string> seachPathes)
             }
         }
 #else
-        internal static void MakeLibSymLink(List<string> seachPathes)
-        {
-            throw new NotSupportedException("Sym Link patch only required on linux platform.");
+        static void MakeLibSymLink(List<string> seachPathes)
+        {
+            throw new NotSupportedException("Sym Link patch only required on linux platform.");
         }
 #endif
         /// <summary>