From: Ben Noordhuis Date: Sun, 30 Oct 2011 03:20:00 +0000 (+0000) Subject: build: fix sunos build, compile lua with __C99FEATURES__=1 X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/b83e95830f45eb5e3b4e7c0a997d611f75f758b8 build: fix sunos build, compile lua with __C99FEATURES__=1 --- diff --git a/src/Makefile b/src/Makefile index 42f0ad01..04f2a68c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,6 +6,8 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') OPTIMIZATION?=-O2 +LUA_CFLAGS=-O2 -Wall + ifeq ($(uname_S),Linux) ifneq ($(FORCE_LIBC_MALLOC),yes) USE_JEMALLOC=yes @@ -13,6 +15,8 @@ ifeq ($(uname_S),Linux) endif ifeq ($(uname_S),SunOS) + # make isinf() available + LUA_CFLAGS+=-D__C99FEATURES__=1 CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6 CCLINK?=-ldl -lnsl -lsocket -lm -lpthread DEBUG?=-g -ggdb @@ -163,7 +167,7 @@ dependencies: @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)linenoise$(ENDCOLOR) @cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)" @echo $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)Lua ansi$(ENDCOLOR) - @cd ../deps/lua && $(MAKE) ARCH="$(ARCH)" ansi + @cd ../deps/lua && $(MAKE) ARCH="$(ARCH)" CFLAGS="$(LUA_CFLAGS)" ansi ../deps/jemalloc/lib/libjemalloc.a: cd ../deps/jemalloc && ./configure $(JEMALLOC_CFLAGS) --with-jemalloc-prefix=je_ --enable-cc-silence && $(MAKE) lib/libjemalloc.a