fix compilation and linking on mac

dvirsky · dvirsky · commit 2dcd5ee8c0fb · 2017-05-09T18:11:59.000+03:00
diff --git a/deps/RedisModuleSDK/rmutil/Makefile b/deps/RedisModuleSDK/rmutil/Makefile
@@ -3,8 +3,12 @@ ifndef RM_INCLUDE_DIR
 	RM_INCLUDE_DIR=../
 endif
 
-CFLAGS = -g -fPIC -lc -lm -O3 -std=gnu99 -I$(RM_INCLUDE_DIR) -Wall -Wno-unused-function
-CC=gcc
+CFLAGS ?= -g -fPIC -lc -lm -O3 -std=gnu99 -I$(RM_INCLUDE_DIR) -Wall -Wno-unused-function
+ifneq ($(uname_S),Linux)
+	CFLAGS += -mmacosx-version-min=10.6
+endif
+
+CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
 
 OBJS=util.o strings.o sds.o vector.o heap.o priority_queue.o alloc.o
 
diff --git a/src/Makefile b/src/Makefile
@@ -17,7 +17,7 @@ endif
 # Find the OS
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 INCLUDE_DIRS = -I"$(RM_INCLUDE_DIR)" -I"$(DEPS_DIR)/jsonsl"  -I"$(DEPS_DIR)/RedisModuleSDK/rmutil"
-CFLAGS =  $(INCLUDE_DIRS) -Wall $(DEBUGFLAGS) -fPIC -std=gnu99  -D_GNU_SOURCE
+CFLAGS = $(INCLUDE_DIRS) -Wall $(DEBUGFLAGS) -fPIC -std=gnu99  -D_GNU_SOURCE
 CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
 
 # Compile flags for linux / osx
@@ -35,7 +35,7 @@ export DEBUGFLAGS
 SOURCEDIR=$(shell pwd -P)
 CC_SOURCES = $(wildcard $(SOURCEDIR)/*.c) $(wildcard $(SOURCEDIR)/dep/*.c) 
 CC_OBJECTS = $(patsubst $(SOURCEDIR)/%.c, $(SOURCEDIR)/%.o, $(CC_SOURCES))
-LIBS = $(DEPS_DIR)/jsonsl/libjsonsl.a $(DEPS_DIR)/RedisModuleSDK/rmutil/librmutil.a
+LIBS = $(DEPS_DIR)/jsonsl/jsonsl.o $(DEPS_DIR)/RedisModuleSDK/rmutil/librmutil.a
 
 all: rejson.so librejson.a
 
diff --git a/test/Makefile b/test/Makefile
@@ -17,7 +17,7 @@ endif
 # find the OS
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 INCLUDE_DIRS = -I"$(RM_INCLUDE_DIR)" -I"$(DEPS_DIR)/jsonsl"  -I"$(DEPS_DIR)/RedisModuleSDK/rmutil"
-CFLAGS =  $(INCLUDE_DIRS) -Wall $(DEBUGFLAGS) -fPIC -std=gnu99 -D_GNU_SOURCE
+CFLAGS =  $(INCLUDE_DIRS) -Wall $(DEBUGFLAGS)  -std=gnu99 -D_GNU_SOURCE
 CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
 
 # Compile flags for linux / osx
@@ -50,7 +50,7 @@ test_json_validator: json_validator
 
 # Build test_object
 object: 
-	$(CC) $(CFLAGS) -o test_$@.out test_$@.c $(LIBS)
+	$(CC) $(CFLAGS) -o test_$@.out test_$@.c $(LIBS) 
 
 # Run test_object
 test_object: object
