diff options
Diffstat (limited to 'src/luarocks/deps.lua')
-rw-r--r-- | src/luarocks/deps.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index 16631c58..1cd500ca 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua | |||
@@ -703,10 +703,10 @@ local function lua_h_exists(d, luaver) | |||
703 | if data:match("LUA_VERSION_NUM%s*" .. tostring(luanum)) then | 703 | if data:match("LUA_VERSION_NUM%s*" .. tostring(luanum)) then |
704 | return d | 704 | return d |
705 | end | 705 | end |
706 | return nil, "Lua header found at " .. d .. " does not match Lua version " .. luaver .. ". You may want to override this by configuring LUA_INCDIR.", "dependency", 2 | 706 | return nil, "Lua header lua.h found at " .. d .. " does not match Lua version " .. luaver .. ". You can use `luarocks config variables.LUA_INCDIR <path>` to set the correct location.", "dependency", 2 |
707 | end | 707 | end |
708 | 708 | ||
709 | return nil, "Failed finding Lua header files (searched at " .. d .. "). You may need to install them or configure LUA_INCDIR.", "dependency", 1 | 709 | return nil, "Failed finding Lua header lua.h (searched at " .. d .. "). You may need to install Lua development headers. You can use `luarocks config variables.LUA_INCDIR <path>` to set the correct location.", "dependency", 1 |
710 | end | 710 | end |
711 | 711 | ||
712 | local function find_lua_incdir(prefix, luaver, luajitver) | 712 | local function find_lua_incdir(prefix, luaver, luajitver) |
@@ -793,7 +793,7 @@ function deps.check_lua_libdir(vars) | |||
793 | end | 793 | end |
794 | local cache = {} | 794 | local cache = {} |
795 | local save_LUA_INCDIR = vars.LUA_INCDIR | 795 | local save_LUA_INCDIR = vars.LUA_INCDIR |
796 | local ok = check_external_dependency("LUA", { library = libnames }, vars, "build", cache) | 796 | local ok, _, _, errfiles = check_external_dependency("LUA", { library = libnames }, vars, "build", cache) |
797 | vars.LUA_INCDIR = save_LUA_INCDIR | 797 | vars.LUA_INCDIR = save_LUA_INCDIR |
798 | local err | 798 | local err |
799 | if ok then | 799 | if ok then |
@@ -806,7 +806,7 @@ function deps.check_lua_libdir(vars) | |||
806 | ok = txt:match("Lua " .. cfg.lua_version, 1, true) | 806 | ok = txt:match("Lua " .. cfg.lua_version, 1, true) |
807 | or txt:match("lua" .. (cfg.lua_version:gsub("%.", "")), 1, true) | 807 | or txt:match("lua" .. (cfg.lua_version:gsub("%.", "")), 1, true) |
808 | if not ok then | 808 | if not ok then |
809 | err = "Lua library at " .. filename .. " does not match Lua version " .. cfg.lua_version .. ". You may want to override this by configuring LUA_LIBDIR." | 809 | err = "Lua library at " .. filename .. " does not match Lua version " .. cfg.lua_version .. ". You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location." |
810 | end | 810 | end |
811 | end | 811 | end |
812 | 812 | ||
@@ -819,8 +819,8 @@ function deps.check_lua_libdir(vars) | |||
819 | vars.LUA_LIBDIR_OK = true | 819 | vars.LUA_LIBDIR_OK = true |
820 | return true | 820 | return true |
821 | else | 821 | else |
822 | err = err or "Failed finding Lua library. You may need to configure LUA_LIBDIR." | 822 | err = err or "Failed finding the Lua library. You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location." |
823 | return nil, err, "dependency" | 823 | return nil, err, "dependency", errfiles |
824 | end | 824 | end |
825 | end | 825 | end |
826 | 826 | ||