diff options
author | Matt Stancliff <matt@genges.com> | 2014-12-19 21:26:04 -0500 |
---|---|---|
committer | Matt Stancliff <matt@genges.com> | 2015-01-02 11:16:10 -0500 |
commit | 25e12d10bebfa38ce864956c0498b432c17eccdd (patch) | |
tree | 788d7c0b1b580a101544a24b019d1403608993c1 /deps/Makefile | |
parent | 9e11d07909086999d54181466eafecab44a0dbe3 (diff) | |
download | redis-25e12d10bebfa38ce864956c0498b432c17eccdd.tar.gz |
Set optional 'static' for Quicklist+Redis
This also defines REDIS_STATIC='' for building everything
inside src/ and everything inside deps/lua/.
Diffstat (limited to 'deps/Makefile')
-rw-r--r-- | deps/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/Makefile b/deps/Makefile index 1f623ea7b..71f6d3a2c 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS) LUA_CFLAGS= -D__C99FEATURES__=1 endif -LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL $(CFLAGS) +LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) LUA_LDFLAGS+= $(LDFLAGS) # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more # challenging to cross-compile lua (and redis). These defines make it easier |