From 5582a41bb647e71231a7c3a1b4bc35b16ed902b6 Mon Sep 17 00:00:00 2001
From: YaacovHazan <31382944+YaacovHazan@users.noreply.github.com>
Date: Sun, 6 Apr 2025 11:09:07 +0300
Subject: [PATCH] Few fixes around make for modules (#13922)

- Suppress errors when removing .so files that may not exist
- Fix -DINCLUDE_VEC_SETS duplication
---
 modules/common.mk |  2 +-
 src/Makefile      | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/common.mk b/modules/common.mk
index bb5f65cc6f..7e6a97546c 100644
--- a/modules/common.mk
+++ b/modules/common.mk
@@ -36,7 +36,7 @@ $(SRC_DIR)/.prepared:
 
 clean:
 	-$(MAKE) -C $(SRC_DIR) clean
-	rm ./*.so
+	-rm -f ./*.so
 
 distclean: clean
 	-$(MAKE) -C $(SRC_DIR) distclean
diff --git a/src/Makefile b/src/Makefile
index c4a8a79ff4..8b0e3d946f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -317,6 +317,12 @@ ifeq ($(BUILD_TLS),module)
 	TLS_MODULE_CFLAGS+=-DUSE_OPENSSL=$(BUILD_MODULE) $(OPENSSL_CFLAGS) -DBUILD_TLS_MODULE=$(BUILD_MODULE)
 endif
 
+ifneq ($(SKIP_VEC_SETS),yes)
+	vpath %.c ../modules/vector-sets
+	REDIS_VEC_SETS_OBJ=hnsw.o cJSON.o vset.o
+	FINAL_CFLAGS+=-DINCLUDE_VEC_SETS=1
+endif
+
 ifndef V
     define MAKE_INSTALL
         @printf '    %b %b\n' $(LINKCOLOR)INSTALL$(ENDCOLOR) $(BINCOLOR)$(1)$(ENDCOLOR) 1>&2
@@ -354,13 +360,6 @@ else
 	GEN_COMMANDS_FLAGS=
 endif
 
-
-ifneq ($(SKIP_VEC_SETS),yes)
-	vpath %.c ../modules/vector-sets
-	REDIS_VEC_SETS_OBJ=hnsw.o cJSON.o vset.o
-	CFLAGS+=-DINCLUDE_VEC_SETS=1
-endif
-
 REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
 REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
 REDIS_SERVER_OBJ=threads_mngr.o adlist.o quicklist.o ae.o anet.o dict.o ebuckets.o eventnotifier.o iothread.o mstr.o kvstore.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o cluster_legacy.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crccombine.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o logreqres.o