After the blamed commit, running a out-of-tree build for ynltool fails :

  # make -C tools/net/ynl/ynltool O=/tmp/o1
  make: Entering directory 'tools/net/ynl/ynltool'
  make: *** No rule to make target '/tmp/o1/json_writer.o', needed by 
'/tmp/o1/ynltool'.  Stop.

ynltool's Makefile correctly accounts for $(OUTPUT) to get the list of
object files to generate :

OBJS := $(patsubst %.c,$(OUTPUT)%.o,$(SRCS))

but it never actually set $(OUTPUT) before the blamed commit, meaning
that out-of-tree buils of ynltool were always actually in-tree.

Now, the O= parameter is correctly accounted for, and the %o: %c rule fails.

Let's update the %o: %c rule to also use $(OUTPUT), as well as the .d
file expansion so that any header change is taken into account.

Reported-by: Bobby Eshleman <[email protected]>
Closes: 
https://lore.kernel.org/all/[email protected]/
Fixes: 917f713b4ec4 ("tools: ynl: Allow cross-compiling ynl and associated 
tools")
Signed-off-by: Maxime Chevallier (Netdev Foundation) 
<[email protected]>
---
V2: Add include $(wildcard $(OUTPUT)*.d), from Nicolai

V1: https://lore.kernel.org/netdev/[email protected]/

 tools/net/ynl/ynltool/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/net/ynl/ynltool/Makefile b/tools/net/ynl/ynltool/Makefile
index b8c67cdb4fdf..e79b8af353c3 100644
--- a/tools/net/ynl/ynltool/Makefile
+++ b/tools/net/ynl/ynltool/Makefile
@@ -23,7 +23,7 @@ OBJS := $(patsubst %.c,$(OUTPUT)%.o,$(SRCS))
 
 YNLTOOL := $(OUTPUT)ynltool
 
-include $(wildcard *.d)
+include $(wildcard $(OUTPUT)*.d)
 
 all: $(YNLTOOL)
 
@@ -31,7 +31,7 @@ $(YNLTOOL): ../libynl.a $(OBJS)
        $(Q)echo -e "\tLINK $@"
        $(Q)$(CC) $(CFLAGS) -o $@ $(OBJS) ../libynl.a -lm
 
-%.o: %.c ../libynl.a
+$(OUTPUT)%.o: %.c ../libynl.a
        $(Q)echo -e "\tCC $@"
        $(Q)$(COMPILE.c) -MMD -c -o $@ $<
 
-- 
2.55.0


Reply via email to