summaryrefslogtreecommitdiff
path: root/deps/Makefile
diff options
context:
space:
mode:
authorDaniel Price <dp@dssd.com>2013-03-11 18:04:40 -0700
committerantirez <antirez@gmail.com>2014-08-12 11:26:34 +0200
commitb57a4d07a210fd0c99d5a3cd286ffdcf9d639ad9 (patch)
tree4917b6e66b34389d0ff8de0690d6202e360ebeb0 /deps/Makefile
parentded57795ff860d27d2889641d0fea9554df4a973 (diff)
downloadredis-b57a4d07a210fd0c99d5a3cd286ffdcf9d639ad9.tar.gz
Define AR to help with lua cross-compilation
Closes #997
Diffstat (limited to 'deps/Makefile')
-rw-r--r--deps/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/deps/Makefile b/deps/Makefile
index 5a95545de..e183ede9c 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -60,10 +60,15 @@ endif
LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(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
+# to fit redis into cross-compilation environments, which typically set AR.
+AR=ar
+ARFLAGS=rcu
lua: .make-prerequisites
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
- cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)"
+ cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
.PHONY: lua