From 45f14ba836736ebbfcd7e4c90ba888992710c48b Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 29 May 2026 11:07:38 +0200 Subject: [PATCH] BUILD: makefile: include EXTRA_MAKE in the .build_opts construction EXTRA_MAKE allows to source an external makefile to bring new options that will result in including add-ons etc. It must be part of the construction of .build_opts that decides whether or not existing .o are reusable or need to be rebuilt, otherwise we can end up with a mix of .o built with some options and others with different options. No backport is needed, as this appeared in 3.4. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index db1fed0a9..7e0448db6 100644 --- a/Makefile +++ b/Makefile @@ -1003,7 +1003,7 @@ IGNORE_OPTS=help install install-man install-doc install-bin \ ifneq ($(TARGET),) ifeq ($(filter $(firstword $(MAKECMDGOALS)),$(IGNORE_OPTS)),) -build_opts = $(shell rm -f .build_opts.new; echo \'$(TARGET) $(BUILD_OPTIONS) $(VERBOSE_CFLAGS) $(WARN_CFLAGS) $(NOWARN_CFLAGS) $(DEBUG)\' > .build_opts.new; if cmp -s .build_opts .build_opts.new; then rm -f .build_opts.new; else mv -f .build_opts.new .build_opts; fi) +build_opts = $(shell rm -f .build_opts.new; echo \'$(TARGET) $(BUILD_OPTIONS) $(EXTRA_MAKE) $(VERBOSE_CFLAGS) $(WARN_CFLAGS) $(NOWARN_CFLAGS) $(DEBUG)\' > .build_opts.new; if cmp -s .build_opts .build_opts.new; then rm -f .build_opts.new; else mv -f .build_opts.new .build_opts; fi) .build_opts: $(build_opts) else .build_opts: