aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/luarocks/deps.lua13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index cbd8962c..25905ae3 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -743,8 +743,17 @@ function deps.check_lua_libdir(vars)
743 local ok = check_external_dependency("LUA", { library = libnames }, vars, "build", cache) 743 local ok = check_external_dependency("LUA", { library = libnames }, vars, "build", cache)
744 vars.LUA_INCDIR = save_LUA_INCDIR 744 vars.LUA_INCDIR = save_LUA_INCDIR
745 if ok then 745 if ok then
746 if fs.exists(dir.path(vars.LUA_LIBDIR, vars.LUA_LIBDIR_FILE)) then 746 local filename = dir.path(vars.LUA_LIBDIR, vars.LUA_LIBDIR_FILE)
747 vars.LUALIB = vars.LUA_LIBDIR_FILE 747 local fd = io.open(filename, "r")
748 if fd then
749 local txt = fd:read("*a")
750 fd:close()
751 if txt:match("Lua " .. cfg.lua_version, 1, true) then
752 vars.LUALIB = vars.LUA_LIBDIR_FILE
753 return true
754 else
755 return nil, "Lua library at " .. filename .. " does not match Lua version " .. cfg.lua_version .. ". You may want to override this by configuring LUA_INCDIR.", "dependency"
756 end
748 end 757 end
749 return true 758 return true
750 end 759 end