From 948285de39e0c19463a99e73c621298d30ec6a87 Mon Sep 17 00:00:00 2001 From: sundb Date: Wed, 2 Feb 2022 03:39:10 +0800 Subject: Fix src/modules build issue on OS X 11 (#10224) --- src/modules/Makefile | 7 +++++++ src/modules/hellocluster.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/modules') diff --git a/src/modules/Makefile b/src/modules/Makefile index 3db19e79a..c4bc7eb1a 100644 --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -11,6 +11,13 @@ else SHOBJ_LDFLAGS ?= -bundle -undefined dynamic_lookup endif +# OS X 11.x doesn't have /usr/lib/libSystem.dylib and needs an explicit setting. +ifeq ($(uname_S),Darwin) +ifeq ("$(wildcard /usr/lib/libSystem.dylib)","") +LIBS = -L /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib -lsystem +endif +endif + .SUFFIXES: .c .so .xo .o all: helloworld.so hellotype.so helloblock.so hellocluster.so hellotimer.so hellodict.so hellohook.so helloacl.so diff --git a/src/modules/hellocluster.c b/src/modules/hellocluster.c index 8f822e31e..a6508f837 100644 --- a/src/modules/hellocluster.c +++ b/src/modules/hellocluster.c @@ -76,7 +76,7 @@ int ListCommand_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int void PingReceiver(RedisModuleCtx *ctx, const char *sender_id, uint8_t type, const unsigned char *payload, uint32_t len) { RedisModule_Log(ctx,"notice","PING (type %d) RECEIVED from %.*s: '%.*s'", type,REDISMODULE_NODE_ID_LEN,sender_id,(int)len, payload); - RedisModule_SendClusterMessage(ctx,NULL,MSGTYPE_PONG,(unsigned char*)"Ohi!",4); + RedisModule_SendClusterMessage(ctx,NULL,MSGTYPE_PONG,"Ohi!",4); RedisModuleCallReply *reply = RedisModule_Call(ctx, "INCR", "c", "pings_received"); RedisModule_FreeCallReply(reply); } -- cgit v1.2.1