Bug 3121217: Test suite fails on Linux x86_64: os.findlib broken

CHANGES.txt

@@ -46,6 +46,7 @@
 * Patch 3451928: VS2008 trying to build *.h files in C projects
 * Patch 3429777: Support for DragonFly BSD (Joachim de Groot)
 * Patch 3445049: Build fix for FreeBSD (Konstantin Tokarev)
+* Bug 3121217: Test suite fails on Linux x86_64: os.findlib broken
 
 
 -------

src/base/os.lua

@@ -46,8 +46,12 @@
 				end
 			end
 			
-			table.insert(formats, "%s")	
-			path = (path or "") .. ":/lib:/usr/lib:/usr/local/lib"
+			table.insert(formats, "%s")
+			path = path or ""
+			if os.is64bit() then
+				path = path .. ":/lib64:/usr/lib64/:usr/local/lib64"
+			end
+			path = ":/lib:/usr/lib:/usr/local/lib"
 		end
 		
 		for _, fmt in ipairs(formats) do