aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/luarocks/core/cfg.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index af57e7ca..b8fedd28 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -657,9 +657,10 @@ function cfg.init(lua_data, project_dir, warning)
657 cfg.lua_version = lua_data.lua_version or cfg.lua_version 657 cfg.lua_version = lua_data.lua_version or cfg.lua_version
658 cfg.luajit_version = lua_data.luajit_version or cfg.luajit_version 658 cfg.luajit_version = lua_data.luajit_version or cfg.luajit_version
659 cfg.lua_interpreter = lua_data.lua_interpreter or cfg.lua_interpreter 659 cfg.lua_interpreter = lua_data.lua_interpreter or cfg.lua_interpreter
660 cfg.variables.LUA_BINDIR = lua_data.lua_bindir or cfg.variables.LUA_BINDIR 660 cfg.variables.LUA_BINDIR = lua_data.lua_bindir or cfg.variables.LUA_BINDIR or lua_bindir
661 cfg.variables.LUA_INCDIR = lua_data.lua_incdir or cfg.variables.LUA_INCDIR 661 cfg.variables.LUA_INCDIR = lua_data.lua_incdir or cfg.variables.LUA_INCDIR or lua_incdir
662 cfg.variables.LUA_LIBDIR = lua_data.lua_libdir or cfg.variables.LUA_LIBDIR 662 cfg.variables.LUA_LIBDIR = lua_data.lua_libdir or cfg.variables.LUA_LIBDIR or lua_libdir
663 cfg.variables.LUA_DIR = lua_data.lua_dir or cfg.variables.LUA_DIR or lua_dir
663 664
664 -- Build a default list of rocks trees if not given 665 -- Build a default list of rocks trees if not given
665 if not next(cfg.rocks_trees) then 666 if not next(cfg.rocks_trees) then