kbuild: rename subdir-obj-y to subdir-builtin (aaa385ba) · Commits · 戴 / test

scripts/Makefile.build

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,8 @@ endif

	# ===========================================================================		# ===========================================================================

	subdir-obj-y := $(filter %/built-in.a, $(real-obj-y))		# subdir-builtin may contain duplications. Use $(sort ...)
			subdir-builtin := $(sort $(filter %/built-in.a, $(real-obj-y)))

	ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),)		ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),)
	lib-target := $(obj)/lib.a		lib-target := $(obj)/lib.a
	@@ -356,7 +357,7 @@ endif
	$(obj)/%.o: $(src)/%.S $(objtool_dep) FORCE		$(obj)/%.o: $(src)/%.S $(objtool_dep) FORCE
	$(call if_changed_rule,as_o_S)		$(call if_changed_rule,as_o_S)

	targets += $(filter-out $(subdir-obj-y), $(real-obj-y)) $(real-obj-m) $(lib-y)		targets += $(filter-out $(subdir-builtin), $(real-obj-y)) $(real-obj-m) $(lib-y)
	targets += $(extra-y) $(always-y) $(MAKECMDGOALS)		targets += $(extra-y) $(always-y) $(MAKECMDGOALS)

	# Linker scripts preprocessor (.lds.S -> .lds)		# Linker scripts preprocessor (.lds.S -> .lds)
	@@ -381,7 +382,7 @@ $(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler
	# ---------------------------------------------------------------------------		# ---------------------------------------------------------------------------

	# To build objects in subdirs, we need to descend into the directories		# To build objects in subdirs, we need to descend into the directories
	$(obj)/%/built-in.a: $(obj)/% ;		$(subdir-builtin): $(obj)/%/built-in.a: $(obj)/% ;

	#		#
	# Rule to compile a set of .o files into one .a file (without symbol table)		# Rule to compile a set of .o files into one .a file (without symbol table)
	@@ -489,7 +490,7 @@ PHONY += $(subdir-ym)
	$(subdir-ym):		$(subdir-ym):
	$(Q)$(MAKE) $(build)=$@ \		$(Q)$(MAKE) $(build)=$@ \
	$(if $(filter $@/, $(KBUILD_SINGLE_TARGETS)),single-build=) \		$(if $(filter $@/, $(KBUILD_SINGLE_TARGETS)),single-build=) \
	need-builtin=$(if $(filter $@/built-in.a, $(subdir-obj-y)),1) \		need-builtin=$(if $(filter $@/built-in.a, $(subdir-builtin)),1) \
	need-modorder=$(if $(need-modorder),$(if $(filter $@/modules.order, $(modorder)),1))		need-modorder=$(if $(need-modorder),$(if $(filter $@/modules.order, $(modorder)),1))

	# Add FORCE to the prequisites of a target to force it to be always rebuilt.		# Add FORCE to the prequisites of a target to force it to be always rebuilt.

Admin message