fix lib extension and remove default mcvcr80 runtime for MinGW

1 files changed, 3 insertions, 3 deletions

diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index 485ff370..e0f1c848 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -73,9 +73,9 @@ function run(rockspec)
       compile_library = function(library, objects, libraries, libdirs, name)
          local extras = { unpack(objects) }
          add_flags(extras, "-L%s", libdirs)
-         add_flags(extras, "%s.lib", libraries)
+         add_flags(extras, "-l%s", libraries)
          extras[#extras+1] = dir.path(variables.LUA_LIBDIR, variables.LUALIB)
-         extras[#extras+1] = "-l" .. (variables.MSVCRT or "msvcr80")
+         extras[#extras+1] = "-l" .. (variables.MSVCRT or "m")
          local ok = execute(variables.LD.." "..variables.LIBFLAG, "-o", library, unpack(extras))
          return ok
       end
@@ -89,7 +89,7 @@ function run(rockspec)
          local ok = execute(variables.RC, "-o", resname, rcname)
          if not ok then return ok end
          ok = execute(variables.LD, "-o", wrapname, resname, variables.WRAPPER,
-                      dir.path(variables.LUA_LIBDIR, variables.LUALIB), "-l" .. (variables.MSVCRT or "msvcr80"), "-luser32")
+                      dir.path(variables.LUA_LIBDIR, variables.LUALIB), "-l" .. (variables.MSVCRT or "m"), "-luser32")
          return ok, wrapname
       end
    elseif cfg.is_platform("win32") then