Bug 2872066: Two test failures in 4.1.2
This commit is contained in:
parent
9a3bf8e5e5
commit
a212a798ec
@ -11,6 +11,7 @@
|
||||
- Bug 2903430: Using relative instead of absolute paths with $() macro
|
||||
- Bug 2910691: Duplicate build options
|
||||
- Bug 2910639: Nil reference on dylib project dependency
|
||||
- Bug 2872066: Two test failures in 4.1.2
|
||||
|
||||
|
||||
-------
|
||||
|
@ -61,7 +61,7 @@
|
||||
defines { "_CRT_SECURE_NO_WARNINGS" }
|
||||
|
||||
configuration "linux"
|
||||
defines { "LUA_USE_LINUX" }
|
||||
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
|
||||
links { "m", "dl" }
|
||||
|
||||
configuration "macosx"
|
||||
|
@ -33,13 +33,13 @@
|
||||
else
|
||||
formats = { "lib%s.so", "%s.so" }
|
||||
path = os.getenv("LD_LIBRARY_PATH") or ""
|
||||
|
||||
local f = io.open("/etc/ld.so.conf", "r")
|
||||
if f then
|
||||
for line in f:lines() do
|
||||
|
||||
io.input("/etc/ld.so.conf")
|
||||
if io.input() then
|
||||
for line in io.lines() do
|
||||
path = path .. ":" .. line
|
||||
end
|
||||
f:close()
|
||||
io.input():close()
|
||||
end
|
||||
end
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user