fix: when linking Lua explicitly (Windows), use dynamic librariesfix-lua-link-windows

The original code was inconsistent, since it demanded dynamic libraries
for Cygwin but static libraries for other Windows compilers. However,
that wouldn't work for the same reason as Cygwin:

From the LuaJIT makefile:
https://github.com/LuaJIT/LuaJIT/blob/ae4735f621d89d84758769b76432d2319dda9827/src/Makefile#L558-L563V

"Mixed mode [static + dynamic] is not supported on Windows.
And static mode doesn't work well.
C modules cannot be loaded, because they bind to lua51.dll."

1 files changed, 4 insertions, 6 deletions

diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 344991f6..676668f8 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -553,15 +553,13 @@ local function check_external_dependency(name, ext_files, vars, mode, cache)
 
    for _, prefix in ipairs(prefixes) do
       prefix = resolve_prefix(prefix, dirs)
-      if cfg.is_platform("mingw32") and name == "LUA" then
-         dirs.LIBDIR.pattern = fun.filter(util.deep_copy(dirs.LIBDIR.pattern), function(s)
-            return not s:match("%.a$")
-         end)
-      elseif cfg.is_platform("windows") and name == "LUA" then
+
+      if name == "LUA" and cfg.link_lua_explicitly then
          dirs.LIBDIR.pattern = fun.filter(util.deep_copy(dirs.LIBDIR.pattern), function(s)
-            return not s:match("%.dll$")
+            return not s:match("%." .. cfg.static_lib_extension .. "$")
          end)
       end
+
       ok, err_dirname, err_testfile = check_external_dependency_at(prefix, name, ext_files, vars, dirs, err_files, cache)
       if ok then
          return true