respect existing LUALIB if given (#1358)

Fixes #1357.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 63803374..01851081 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -712,8 +712,13 @@ function deps.check_lua_incdir(vars)
 end
 
 function deps.check_lua_libdir(vars)
+   local fs = require("luarocks.fs")
    local ljv = util.get_luajit_version()
 
+   if vars.LUA_LIBDIR and vars.LUALIB and fs.exists(dir.path(vars.LUA_LIBDIR, vars.LUALIB)) then
+      return true
+   end
+
    local shortv = cfg.lua_version:gsub("%.", "")
    local libnames = {
       "lua" .. cfg.lua_version,
@@ -730,7 +735,9 @@ function deps.check_lua_libdir(vars)
    local ok = check_external_dependency("LUA", { library = libnames }, vars, "build", cache)
    vars.LUA_INCDIR = save_LUA_INCDIR
    if ok then
-      vars.LUALIB = vars.LUA_LIBDIR_FILE
+      if fs.exists(dir.path(vars.LUA_LIBDIR, vars.LUA_LIBDIR_FILE)) then
+         vars.LUALIB = vars.LUA_LIBDIR_FILE
+      end
       return true
    end
    return nil, "Failed finding Lua library. You may need to configure LUA_LIBDIR.", "dependency"