From a05cfbe33aad7d76420d3e40c578e75d53972c30 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 12 Nov 2020 09:36:45 -0700 Subject: [PATCH] Makefile: fix fio version gen A previous commit moved the cflags override, but neglected to move the version generation that is being used by it. Fixes: f4bd2c3d80bc ("fix dynamic engine build") Signed-off-by: Jens Axboe --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0d3c877e..ecfaa3e0 100644 --- a/Makefile +++ b/Makefile @@ -263,6 +263,10 @@ CFLAGS += $$($(1)_CFLAGS) endef endif +FIO-VERSION-FILE: FORCE + @$(SHELL) $(SRCDIR)/FIO-VERSION-GEN +-include FIO-VERSION-FILE + override CFLAGS := -DFIO_VERSION='"$(FIO_VERSION)"' $(FIO_CFLAGS) $(CFLAGS) $(foreach eng,$(ENGINES),$(eval $(call engine_template,$(eng)))) @@ -433,10 +437,6 @@ all: $(PROGS) $(T_TEST_PROGS) $(UT_PROGS) $(SCRIPTS) $(ENGS_OBJS) FORCE .PHONY: all install clean test .PHONY: FORCE cscope -FIO-VERSION-FILE: FORCE - @$(SHELL) $(SRCDIR)/FIO-VERSION-GEN --include FIO-VERSION-FILE - %.o : %.c @mkdir -p $(dir $@) $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $< -- 2.25.1