diff options
| author | François Perrad <francois.perrad@gadz.org> | 2019-11-22 22:35:40 +0100 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2019-11-22 18:35:40 -0300 |
| commit | bd98e53f02c76755c17235f1c38151816460f108 (patch) | |
| tree | 54ac3829483beb3f2d6f9848eb4051589edbd3e8 | |
| parent | 9446ac85d8bf085d2a6f0a02a6a432e14dddac61 (diff) | |
| download | luarocks-bd98e53f02c76755c17235f1c38151816460f108.tar.gz luarocks-bd98e53f02c76755c17235f1c38151816460f108.tar.bz2 luarocks-bd98e53f02c76755c17235f1c38151816460f108.zip | |
Improve jit detection to support moonjit (#1116)
moonjit is a fork of LuaJIT, where jit.version = 'moonjit 2.1.1'
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
| -rw-r--r-- | src/luarocks/util.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua index 05b2566b..a7c31422 100644 --- a/src/luarocks/util.lua +++ b/src/luarocks/util.lua | |||
| @@ -454,7 +454,7 @@ do | |||
| 454 | 454 | ||
| 455 | local ljv | 455 | local ljv |
| 456 | if cfg.lua_version == "5.1" then | 456 | if cfg.lua_version == "5.1" then |
| 457 | ljv = util.popen_read(Q(cfg.variables["LUA_BINDIR"] .. "/" .. cfg.lua_interpreter) .. ' -e "io.write(tostring(jit and jit.version:gsub([[^%w-JIT ]], [[]])))"') | 457 | ljv = util.popen_read(Q(cfg.variables["LUA_BINDIR"] .. "/" .. cfg.lua_interpreter) .. ' -e "io.write(tostring(jit and jit.version:gsub([[^%S+ ]], [[]])))"') |
| 458 | if ljv == "nil" then | 458 | if ljv == "nil" then |
| 459 | ljv = nil | 459 | ljv = nil |
| 460 | end | 460 | end |