X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=build%2Fgccconfig.mk;h=97d19bde35db2ba495f2f73550b013c8f3252ccb;hp=d6af2c3e66dde0524a9f2c88713ddd115c8d580e;hb=8da6c1a49f2ab91d8816a41df0ce5cacb5b9f084;hpb=a02f12cf2e2becfe976faa6ff1e5a585c78a513d diff --git a/build/gccconfig.mk b/build/gccconfig.mk index d6af2c3e6..97d19bde3 100644 --- a/build/gccconfig.mk +++ b/build/gccconfig.mk @@ -1,8 +1,8 @@ OS ?= $(shell uname) -LUA_SHLIBS = $(shell pkg-config --silence-errors --libs lua5.1 || pkg-config --silence-errors --libs lua) +LUA_SHLIBS = $(shell pkg-config --silence-errors --libs lua5.1 || pkg-config --silence-errors --libs lua-5.1 || pkg-config --silence-errors --libs lua) LUA_LIBS = $(if $(LUA_SHLIBS),$(LUA_SHLIBS),$(firstword $(wildcard /usr/lib/liblua.a /usr/local/lib/liblua.a /opt/local/lib/liblua.a))) -LUA_CFLAGS = $(shell pkg-config --silence-errors --cflags lua5.1 || pkg-config --silence-errors --cflags lua) +LUA_CFLAGS = $(shell pkg-config --silence-errors --cflags lua5.1 || pkg-config --silence-errors --cflags lua-5.1 || pkg-config --silence-errors --cflags lua) CC = gcc AR = ar @@ -10,7 +10,7 @@ RANLIB = ranlib CFLAGS = -O2 FPIC = -fPIC EXTRA_CFLAGS = --std=gnu99 -WFLAGS = -Wall -Werror -pedantic +WFLAGS = -Wall -pedantic CPPFLAGS = COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS) ifeq ($(OS),Darwin)