2
0
Эх сурвалжийг харах

updated library search paths

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7907 8c9fc860-2736-0410-a75d-ab315db34111
eth.guenter 7 жил өмнө
parent
commit
714a930f51

+ 5 - 3
source/Generic.Linux.AMD64.Unix.Mod

@@ -1044,10 +1044,12 @@ VAR
 		environ := Glue.environ;
 		environ := Glue.environ;
 
 
 		libraryPaths[0] := "/lib/x86_64-linux-gnu";
 		libraryPaths[0] := "/lib/x86_64-linux-gnu";
-		libraryPaths[1] := "/usr/lib/x86_64-linux-gnu";
+		libraryPaths[1] := "/lib64";
 		libraryPaths[2] := "/lib";
 		libraryPaths[2] := "/lib";
-		libraryPaths[3] := "/usr/lib";
-		noPaths := 4;
+		libraryPaths[3] := "/usr/lib/x86_64-linux-gnu";
+		libraryPaths[4] := "/usr/lib64";
+		libraryPaths[5] := "/usr/lib";
+		noPaths := 6;
 
 
 		libc := Dlopen( libcname, 2 );
 		libc := Dlopen( libcname, 2 );
 		libp := Dlopen( libpthreadname, 2 );
 		libp := Dlopen( libpthreadname, 2 );

+ 5 - 4
source/Generic.Linux.I386.Unix.Mod

@@ -1041,12 +1041,13 @@ VAR
 		environ := Glue.environ;
 		environ := Glue.environ;
 
 
 		libraryPaths[0] := "/lib/i386-linux-gnu/i686/cmov";
 		libraryPaths[0] := "/lib/i386-linux-gnu/i686/cmov";
-		libraryPaths[1] := "/usr/lib/i386-linux-gnu";
-		libraryPaths[2] := "/lib/i386-linux-gnu";
+		libraryPaths[1] := "/lib/i386-linux-gnu";
+		libraryPaths[2] := "/lib32";
 		libraryPaths[3] := "/lib";
 		libraryPaths[3] := "/lib";
-		libraryPaths[4] := "/usr/lib";
+		libraryPaths[4] := "/usr/lib/i386-linux-gnu";
 		libraryPaths[5] := "/usr/lib32";
 		libraryPaths[5] := "/usr/lib32";
-		noPaths := 6;
+		libraryPaths[6] := "/usr/lib";
+		noPaths := 7;
 
 
 		libc := Dlopen( libcname, 2 );
 		libc := Dlopen( libcname, 2 );
 		libp := Dlopen( libpthreadname, 2 );
 		libp := Dlopen( libpthreadname, 2 );