diff options
Diffstat (limited to 'src/luarocks/deps.lua')
-rw-r--r-- | src/luarocks/deps.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index 2680b64b..16631c58 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua | |||
@@ -706,7 +706,7 @@ local function lua_h_exists(d, luaver) | |||
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 found at " .. d .. " does not match Lua version " .. luaver .. ". You may want to override this by configuring LUA_INCDIR.", "dependency", 2 |
707 | end | 707 | end |
708 | 708 | ||
709 | return nil, "Failed finding Lua header files. You may need to install them or configure LUA_INCDIR.", "dependency", 1 | 709 | return nil, "Failed finding Lua header files (searched at " .. d .. "). You may need to install them or configure LUA_INCDIR.", "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) |
@@ -763,7 +763,7 @@ function deps.check_lua_incdir(vars) | |||
763 | return nil, err | 763 | return nil, err |
764 | end | 764 | end |
765 | 765 | ||
766 | return nil, "Failed finding Lua header files. You may need to install them or configure LUA_INCDIR.", "dependency" | 766 | return nil, "Failed finding Lua headers; neither LUA_DIR or LUA_INCDIR are set. You may need to install them or configure LUA_INCDIR.", "dependency" |
767 | end | 767 | end |
768 | 768 | ||
769 | function deps.check_lua_libdir(vars) | 769 | function deps.check_lua_libdir(vars) |
@@ -789,6 +789,7 @@ function deps.check_lua_libdir(vars) | |||
789 | } | 789 | } |
790 | if ljv then | 790 | if ljv then |
791 | table.insert(libnames, 1, "luajit-" .. cfg.lua_version) | 791 | table.insert(libnames, 1, "luajit-" .. cfg.lua_version) |
792 | table.insert(libnames, 2, "luajit") | ||
792 | end | 793 | end |
793 | local cache = {} | 794 | local cache = {} |
794 | local save_LUA_INCDIR = vars.LUA_INCDIR | 795 | local save_LUA_INCDIR = vars.LUA_INCDIR |