diff options
Diffstat (limited to 'src/luarocks/cfg.lua')
-rw-r--r-- | src/luarocks/cfg.lua | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 50d247b5..ea80e5b5 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua | |||
@@ -227,7 +227,7 @@ local defaults = { | |||
227 | } | 227 | } |
228 | }, | 228 | }, |
229 | disabled_servers = {}, | 229 | disabled_servers = {}, |
230 | 230 | ||
231 | upload = { | 231 | upload = { |
232 | server = "https://rocks.moonscript.org", | 232 | server = "https://rocks.moonscript.org", |
233 | tool_version = "1.0.0", | 233 | tool_version = "1.0.0", |
@@ -315,7 +315,7 @@ if detected.windows then | |||
315 | defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR and site_config.LUA_BINDIR:gsub("\\", "/") or "c:/lua"..cfg.lua_version.."/bin" | 315 | defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR and site_config.LUA_BINDIR:gsub("\\", "/") or "c:/lua"..cfg.lua_version.."/bin" |
316 | defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR and site_config.LUA_INCDIR:gsub("\\", "/") or "c:/lua"..cfg.lua_version.."/include" | 316 | defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR and site_config.LUA_INCDIR:gsub("\\", "/") or "c:/lua"..cfg.lua_version.."/include" |
317 | defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR and site_config.LUA_LIBDIR:gsub("\\", "/") or "c:/lua"..cfg.lua_version.."/lib" | 317 | defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR and site_config.LUA_LIBDIR:gsub("\\", "/") or "c:/lua"..cfg.lua_version.."/lib" |
318 | defaults.cmake_generator = "MinGW Makefiles" | 318 | |
319 | defaults.makefile = "Makefile.win" | 319 | defaults.makefile = "Makefile.win" |
320 | defaults.variables.MAKE = "nmake" | 320 | defaults.variables.MAKE = "nmake" |
321 | defaults.variables.CC = "cl" | 321 | defaults.variables.CC = "cl" |
@@ -363,7 +363,6 @@ end | |||
363 | if detected.mingw32 then | 363 | if detected.mingw32 then |
364 | defaults.platforms = { "win32", "mingw32", "windows" } | 364 | defaults.platforms = { "win32", "mingw32", "windows" } |
365 | defaults.obj_extension = "o" | 365 | defaults.obj_extension = "o" |
366 | defaults.cmake_generator = "MinGW Makefiles" | ||
367 | defaults.variables.MAKE = "mingw32-make" | 366 | defaults.variables.MAKE = "mingw32-make" |
368 | defaults.variables.CC = "mingw32-gcc" | 367 | defaults.variables.CC = "mingw32-gcc" |
369 | defaults.variables.RC = "windres" | 368 | defaults.variables.RC = "windres" |
@@ -394,7 +393,6 @@ if detected.unix then | |||
394 | defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "/usr/local/include" | 393 | defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "/usr/local/include" |
395 | defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "/usr/local/lib" | 394 | defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "/usr/local/lib" |
396 | defaults.variables.CFLAGS = "-O2" | 395 | defaults.variables.CFLAGS = "-O2" |
397 | defaults.cmake_generator = "Unix Makefiles" | ||
398 | defaults.platforms = { "unix" } | 396 | defaults.platforms = { "unix" } |
399 | defaults.variables.CC = "gcc" | 397 | defaults.variables.CC = "gcc" |
400 | defaults.variables.LD = "gcc" | 398 | defaults.variables.LD = "gcc" |
@@ -426,7 +424,6 @@ if detected.cygwin then | |||
426 | defaults.lib_extension = "so" -- can be overridden in the config file for mingw builds | 424 | defaults.lib_extension = "so" -- can be overridden in the config file for mingw builds |
427 | defaults.arch = "cygwin-"..proc | 425 | defaults.arch = "cygwin-"..proc |
428 | defaults.platforms = {"unix", "cygwin"} | 426 | defaults.platforms = {"unix", "cygwin"} |
429 | defaults.cmake_generator = "Unix Makefiles" | ||
430 | defaults.variables.CC = "echo -llua | xargs gcc" | 427 | defaults.variables.CC = "echo -llua | xargs gcc" |
431 | defaults.variables.LD = "echo -llua | xargs gcc" | 428 | defaults.variables.LD = "echo -llua | xargs gcc" |
432 | defaults.variables.LIBFLAG = "-shared" | 429 | defaults.variables.LIBFLAG = "-shared" |
@@ -569,7 +566,7 @@ function cfg.package_paths() | |||
569 | table.insert(new_cpath, lib_path.."/?."..cfg.lib_extension) | 566 | table.insert(new_cpath, lib_path.."/?."..cfg.lib_extension) |
570 | table.insert(new_bin, bin_path) | 567 | table.insert(new_bin, bin_path) |
571 | end | 568 | end |
572 | if extra_luarocks_module_dir then | 569 | if extra_luarocks_module_dir then |
573 | table.insert(new_path, extra_luarocks_module_dir) | 570 | table.insert(new_path, extra_luarocks_module_dir) |
574 | end | 571 | end |
575 | return table.concat(new_path, ";"), table.concat(new_cpath, ";"), table.concat(new_bin, cfg.export_path_separator) | 572 | return table.concat(new_path, ";"), table.concat(new_cpath, ";"), table.concat(new_bin, cfg.export_path_separator) |