diff options
authorBryce Kwon <bryce@brycekwon.com>
committerBryce Kwon <bryce@brycekwon.com>
commit
parent
tree
download
Detect Lua 5.5 when building
cgit builds against Lua 5.5 and serves the same pages with it, but a host whose only Lua was 5.5 got a binary without Lua from the search.
-rw-r--r--README.txt6
-rw-r--r--source/cgit.mk2
2 files changed, 4 insertions, 4 deletions
diff --git a/README.txt b/README.txt
index 2bc9f39..ce54130 100644
--- a/README.txt
+++ b/README.txt
@@ -41,9 +41,9 @@ pin an implementation, name its pkg-config module.
$ make LUA_PKGCONFIG=lua5.4
-Acceptable LUA_PKGCONFIG values include "luajit", "lua", "lua5.4", "lua5.3",
-"lua5.2" and "lua5.1". To build without Lua, so the binary needs no Lua at
-runtime, turn it off.
+Acceptable LUA_PKGCONFIG values include "luajit", "lua", "lua5.5", "lua5.4",
+"lua5.3", "lua5.2" and "lua5.1". To build without Lua, so the binary needs no
+Lua at runtime, turn it off.
$ make NO_LUA=1
diff --git a/source/cgit.mk b/source/cgit.mk
index 6e17737..07c80e9 100644
--- a/source/cgit.mk
+++ b/source/cgit.mk
@@ -60,7 +60,7 @@ ifdef NO_LUA
CGIT_CFLAGS += -DNO_LUA
else
ifeq ($(LUA_PKGCONFIG),)
- LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.4 lua5.3 lua5.2 lua5.1; do \
+ LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.5 lua5.4 lua5.3 lua5.2 lua5.1; do \
$(PKG_CONFIG) --exists $$pc 2>/dev/null && echo $$pc && break; \
done)
LUA_MODE := autodetected