aboutsummaryrefslogtreecommitdiff
path: root/src/luarocks/deps.lua
diff options
context:
space:
mode:
Diffstat (limited to 'src/luarocks/deps.lua')
-rw-r--r--src/luarocks/deps.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 6eb19aba..874787da 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -497,7 +497,7 @@ function deps.scan_deps(results, manifest, name, version, deps_mode)
497 rocks_provided = rockspec.rocks_provided 497 rocks_provided = rockspec.rocks_provided
498 mdn[version] = dependencies 498 mdn[version] = dependencies
499 else 499 else
500 rocks_provided = setmetatable({}, { __index = cfg.rocks_provided_3_0 }) 500 rocks_provided = util.get_rocks_provided()
501 end 501 end
502 local matched = deps.match_deps(dependencies, rocks_provided, nil, deps_mode) 502 local matched = deps.match_deps(dependencies, rocks_provided, nil, deps_mode)
503 results[name] = version 503 results[name] = version
@@ -533,8 +533,9 @@ end
533 533
534function deps.check_lua(vars) 534function deps.check_lua(vars)
535 local incdir_found = true 535 local incdir_found = true
536 local ljv = util.get_luajit_version()
536 if (not vars.LUA_INCDIR) and vars.LUA_DIR then 537 if (not vars.LUA_INCDIR) and vars.LUA_DIR then
537 vars.LUA_INCDIR = find_lua_incdir(vars.LUA_DIR, cfg.lua_version, cfg.luajit_version) 538 vars.LUA_INCDIR = find_lua_incdir(vars.LUA_DIR, cfg.lua_version, ljv)
538 incdir_found = (vars.LUA_INCDIR ~= nil) 539 incdir_found = (vars.LUA_INCDIR ~= nil)
539 end 540 end
540 local shortv = cfg.lua_version:gsub("%.", "") 541 local shortv = cfg.lua_version:gsub("%.", "")
@@ -545,7 +546,7 @@ function deps.check_lua(vars)
545 "lua-" .. shortv, 546 "lua-" .. shortv,
546 "lua", 547 "lua",
547 } 548 }
548 if cfg.luajit_version then 549 if ljv then
549 table.insert(libnames, 1, "luajit-" .. cfg.lua_version) 550 table.insert(libnames, 1, "luajit-" .. cfg.lua_version)
550 end 551 end
551 local cache = {} 552 local cache = {}