tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

perf build: Fix perf build issues with fixdep

Commit a808a2b35f66 ("tools build: Fix fixdep dependencies") broke the
perf build ("make -C tools/perf") by introducing two inadvertent
conflicts:

1) tools/build/Makefile includes tools/build/Makefile.include, which
defines a phony 'fixdep' target. This conflicts with the $(FIXDEP)
file target in tools/build/Makefile when OUTPUT is empty, causing
make to report duplicate recipes for the same target.

2) The FIXDEP variable in tools/build/Makefile conflicts with the
previously existing one in tools/perf/Makefile.perf.

Remove the unnecessary include of tools/build/Makefile.include from
tools/build/Makefile, and rename the FIXDEP variable in
tools/perf/Makefile.perf to FIXDEP_BUILT.

Fixes: a808a2b35f66 ("tools build: Fix fixdep dependencies")
Reported-by: Thorsten Leemhuis <linux@leemhuis.info>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Thorsten Leemhuis <linux@leemhuis.info>
Link: https://patch.msgid.link/8881bc3321bd9fa58802e4f36286eefe3667806b.1760992391.git.jpoimboe@kernel.org

authored by

Josh Poimboeuf and committed by
Peter Zijlstra f6af8690 9025688b

+3 -5
-2
tools/build/Makefile
··· 37 37 $(Q)$(MAKE) -C feature OUTPUT=$(TMP_O) clean >/dev/null 38 38 endif 39 39 40 - include $(srctree)/tools/build/Makefile.include 41 - 42 40 FIXDEP := $(OUTPUT)fixdep 43 41 FIXDEP_IN := $(OUTPUT)fixdep-in.o 44 42
+3 -3
tools/perf/Makefile.perf
··· 234 234 # The fixdep build - we force fixdep tool to be built as 235 235 # the first target in the separate make session not to be 236 236 # disturbed by any parallel make jobs. Once fixdep is done 237 - # we issue the requested build with FIXDEP=1 variable. 237 + # we issue the requested build with FIXDEP_BUILT=1 variable. 238 238 # 239 239 # The fixdep build is disabled for $(NON_CONFIG_TARGETS) 240 240 # targets, because it's not necessary. 241 241 242 - ifdef FIXDEP 242 + ifdef FIXDEP_BUILT 243 243 force_fixdep := 0 244 244 else 245 245 force_fixdep := $(config) ··· 286 286 287 287 sub-make: fixdep 288 288 @./check-headers.sh 289 - $(Q)$(MAKE) FIXDEP=1 -f Makefile.perf $(goals) 289 + $(Q)$(MAKE) FIXDEP_BUILT=1 -f Makefile.perf $(goals) 290 290 291 291 else # force_fixdep 292 292