From 77de812207a1cddac6b791b41f0693484682e153 Mon Sep 17 00:00:00 2001 From: WHC Date: Wed, 7 Oct 2026 01:52:42 +0800 Subject: [PATCH] sashidown: keep -Iinclude when parent make overrides CFLAGS CI passes CFLAGS=-Werror on the command line; that wiped the library's CFLAGS ?= ... -Iinclude -Isrc, so fsm.h could not find sashidown.h. Always append the include paths via override CPPFLAGS. --- vendor/sashidown/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vendor/sashidown/Makefile b/vendor/sashidown/Makefile index ad3c3c9..b32a05d 100644 --- a/vendor/sashidown/Makefile +++ b/vendor/sashidown/Makefile @@ -1,5 +1,8 @@ CC ?= gcc -CFLAGS ?= -std=c11 -Wall -Wextra -O2 -Iinclude -Isrc +CFLAGS ?= -std=c11 -Wall -Wextra -O2 +# Keep include paths when a parent make passes CFLAGS=... on the command +# line (CI uses -Werror that way); plain CFLAGS ?= would be overridden. +override CPPFLAGS += -Iinclude -Isrc SRCS = src/fsm.c src/table_stats.c src/line_index.c src/block_scan.c \ src/ansi_style.c src/render.c src/render_ansi.c src/render_json.c \ src/sashidown.c src/compat_cmark.c src/stream.c @@ -11,6 +14,6 @@ all: $(LIB) $(LIB): $(OBJS) $(AR) rcs $@ $(OBJS) src/%.o: src/%.c - $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< clean: rm -f $(OBJS) $(LIB)