Add link_lua_explicitly option.

Remove explicit reference to cygwin, and make option
available for custom environments.

2 files changed, 3 insertions, 1 deletions

diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index 6719be81..c36aa96f 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -164,7 +164,7 @@ function builtin.run(rockspec)
             add_flags(extras, "-Wl,-rpath,%s:", libdirs)
          end
          add_flags(extras, "-l%s", libraries)
-         if cfg.is_platform("cygwin") then
+         if cfg.link_lua_explicitly then
             add_flags(extras, "-l%s", {"lua"})
          end
          return execute(variables.LD.." "..variables.LIBFLAG, "-o", library, "-L"..variables.LUA_LIBDIR, unpack(extras))
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 33176161..9200dd26 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -315,6 +315,7 @@ local defaults = {
    arch = "unknown",
    lib_extension = "unknown",
    obj_extension = "unknown",
+   link_lua_explicitly = false,
 
    rocks_servers = {
       {
@@ -527,6 +528,7 @@ if cfg.platforms.cygwin then
    defaults.variables.CC = "echo -llua | xargs gcc"
    defaults.variables.LD = "echo -llua | xargs gcc"
    defaults.variables.LIBFLAG = "-shared"
+   defaults.link_lua_explicitly = true
 end
 
 if cfg.platforms.msys then