| Message ID | 20240702215854.408532-3-briannorris@chromium.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | tools build: Incorrect fixdep dependencies | expand |
On Tue, Jul 02, 2024 at 02:58:38PM -0700, Brian Norris wrote: > The 'fixdep' tool is used to post-process dependency files for various > reasons, and it runs after every object file generation command. This > even includes 'fixdep' itself. > > In Kbuild, this isn't actually a problem, because it uses a single > command to generate fixdep (a compile-and-link command on fixdep.c), and > afterward runs the fixdep command on the accompanying .fixdep.cmd file. > > In tools/ builds (which notably is maintained separately from Kbuild), > fixdep is generated in several phases: > > 1. fixdep.c -> fixdep-in.o > 2. fixdep-in.o -> fixdep > > Thus, fixdep is not available in the post-processing for step 1, and > instead, we generate .cmd files that look like: > > ## from tools/objtool/libsubcmd/.fixdep.o.cmd > # cannot find fixdep (/path/to/linux/tools/objtool/libsubcmd//fixdep) > [...] > > These invalid .cmd files are benign in some respects, but cause problems > in others (such as the linked reports). > > Because the tools/ build system is rather complicated in its own right > (and pointedly different than Kbuild), I choose to simply open-code the > rule for building fixdep, and avoid the recursive-make indirection that > produces the problem in the first place. > > Link: https://lore.kernel.org/all/Zk-C5Eg84yt6_nml@google.com/ > Signed-off-by: Brian Norris <briannorris@chromium.org> > --- > > (no changes since v1) > > tools/build/Makefile | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/tools/build/Makefile b/tools/build/Makefile > index 17cdf01e29a0..fea3cf647f5b 100644 > --- a/tools/build/Makefile > +++ b/tools/build/Makefile > @@ -43,12 +43,5 @@ ifneq ($(wildcard $(TMP_O)),) > $(Q)$(MAKE) -C feature OUTPUT=$(TMP_O) clean >/dev/null > endif > > -$(OUTPUT)fixdep-in.o: FORCE > - $(Q)$(MAKE) $(build)=fixdep > - > -$(OUTPUT)fixdep: $(OUTPUT)fixdep-in.o > - $(QUIET_LINK)$(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ $< > - > -FORCE: > - > -.PHONY: FORCE > +$(OUTPUT)fixdep: $(srctree)/tools/build/fixdep.c > + $(QUIET_CC)$(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ $< ok, looks like that will make things easier, also we won't need tools/build/Build thanks, jirka
diff --git a/tools/build/Makefile b/tools/build/Makefile index 17cdf01e29a0..fea3cf647f5b 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -43,12 +43,5 @@ ifneq ($(wildcard $(TMP_O)),) $(Q)$(MAKE) -C feature OUTPUT=$(TMP_O) clean >/dev/null endif -$(OUTPUT)fixdep-in.o: FORCE - $(Q)$(MAKE) $(build)=fixdep - -$(OUTPUT)fixdep: $(OUTPUT)fixdep-in.o - $(QUIET_LINK)$(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ $< - -FORCE: - -.PHONY: FORCE +$(OUTPUT)fixdep: $(srctree)/tools/build/fixdep.c + $(QUIET_CC)$(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ $<
The 'fixdep' tool is used to post-process dependency files for various reasons, and it runs after every object file generation command. This even includes 'fixdep' itself. In Kbuild, this isn't actually a problem, because it uses a single command to generate fixdep (a compile-and-link command on fixdep.c), and afterward runs the fixdep command on the accompanying .fixdep.cmd file. In tools/ builds (which notably is maintained separately from Kbuild), fixdep is generated in several phases: 1. fixdep.c -> fixdep-in.o 2. fixdep-in.o -> fixdep Thus, fixdep is not available in the post-processing for step 1, and instead, we generate .cmd files that look like: ## from tools/objtool/libsubcmd/.fixdep.o.cmd # cannot find fixdep (/path/to/linux/tools/objtool/libsubcmd//fixdep) [...] These invalid .cmd files are benign in some respects, but cause problems in others (such as the linked reports). Because the tools/ build system is rather complicated in its own right (and pointedly different than Kbuild), I choose to simply open-code the rule for building fixdep, and avoid the recursive-make indirection that produces the problem in the first place. Link: https://lore.kernel.org/all/Zk-C5Eg84yt6_nml@google.com/ Signed-off-by: Brian Norris <briannorris@chromium.org> --- (no changes since v1) tools/build/Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)