mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-27 11:06:41 -05:00
Commita808a2b35f("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:a808a2b35f("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
59 lines
1.5 KiB
Makefile
59 lines
1.5 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
ifeq ($(srctree),)
|
|
srctree := $(patsubst %/,%,$(dir $(CURDIR)))
|
|
srctree := $(patsubst %/,%,$(dir $(srctree)))
|
|
endif
|
|
|
|
include $(srctree)/tools//scripts/Makefile.include
|
|
|
|
define allow-override
|
|
$(if $(or $(findstring environment,$(origin $(1))),\
|
|
$(findstring command line,$(origin $(1)))),,\
|
|
$(eval $(1) = $(2)))
|
|
endef
|
|
|
|
$(call allow-override,CC,$(CROSS_COMPILE)gcc)
|
|
$(call allow-override,LD,$(CROSS_COMPILE)ld)
|
|
|
|
export HOSTCC HOSTLD HOSTAR
|
|
|
|
export srctree CC LD
|
|
|
|
MAKEFLAGS := --no-print-directory
|
|
build := -f $(srctree)/tools/build/Makefile.build dir=. obj
|
|
|
|
all: $(OUTPUT)fixdep
|
|
|
|
# Make sure there's anything to clean,
|
|
# feature contains check for existing OUTPUT
|
|
TMP_O := $(if $(OUTPUT),$(OUTPUT)feature/,./)
|
|
|
|
clean:
|
|
$(call QUIET_CLEAN, fixdep)
|
|
$(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
|
|
$(Q)rm -f $(OUTPUT)fixdep
|
|
$(call QUIET_CLEAN, feature-detect)
|
|
ifneq ($(wildcard $(TMP_O)),)
|
|
$(Q)$(MAKE) -C feature OUTPUT=$(TMP_O) clean >/dev/null
|
|
endif
|
|
|
|
FIXDEP := $(OUTPUT)fixdep
|
|
FIXDEP_IN := $(OUTPUT)fixdep-in.o
|
|
|
|
# To track fixdep's dependencies properly, fixdep needs to run on itself.
|
|
# Build it twice the first time.
|
|
$(FIXDEP_IN): FORCE
|
|
$(Q)if [ ! -f $(FIXDEP) ]; then \
|
|
$(MAKE) $(build)=fixdep HOSTCFLAGS="$(KBUILD_HOSTCFLAGS)"; \
|
|
rm -f $(FIXDEP).o; \
|
|
fi
|
|
$(Q)$(MAKE) $(build)=fixdep HOSTCFLAGS="$(KBUILD_HOSTCFLAGS)"
|
|
|
|
|
|
$(FIXDEP): $(FIXDEP_IN)
|
|
$(QUIET_LINK)$(HOSTCC) $(FIXDEP_IN) $(KBUILD_HOSTLDFLAGS) -o $@
|
|
|
|
FORCE:
|
|
|
|
.PHONY: FORCE
|