From af55579658cf8170cad6e4598ab946e0c804cafb Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Thu, 9 May 2024 09:25:56 +0300 Subject: [PATCH] Add 'override' to all accumulating variables Without 'override' the extra values are not appended if the variable is provided by the user, e.g. `make CFLAGS="my custom flags"` Signed-off-by: Martin Tzvetanov Grigorov --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 17b13b64..f0767c86 100644 --- a/Makefile +++ b/Makefile @@ -20,22 +20,22 @@ else # if sse2only is defined endif else # if arm_neon is defined OBJS+=ksw2_extz2_neon.o ksw2_extd2_neon.o ksw2_exts2_neon.o - INCLUDES+=-Isse2neon + override INCLUDES+=-Isse2neon ifeq ($(aarch64),) #if aarch64 is not defined - CFLAGS+=-D_FILE_OFFSET_BITS=64 -mfpu=neon -fsigned-char + override CFLAGS+=-D_FILE_OFFSET_BITS=64 -mfpu=neon -fsigned-char else #if aarch64 is defined - CFLAGS+=-D_FILE_OFFSET_BITS=64 -fsigned-char + override CFLAGS+=-D_FILE_OFFSET_BITS=64 -fsigned-char endif endif ifneq ($(asan),) - CFLAGS+=-fsanitize=address - LIBS+=-fsanitize=address -ldl + override CFLAGS+=-fsanitize=address + override LIBS+=-fsanitize=address -ldl endif ifneq ($(tsan),) - CFLAGS+=-fsanitize=thread - LIBS+=-fsanitize=thread -ldl + override CFLAGS+=-fsanitize=thread + override LIBS+=-fsanitize=thread -ldl endif .PHONY:all extra clean depend