kbuild: fix vmlinux.o link

We always linked vmliux.o. Remove init/built-in.o dependency so we avoid this Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

kbuild: fix vmlinux.o link
We always linked vmliux.o. Remove init/built-in.o dependency so we avoid this Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Sam Ravnborg
1 parent b44158de9e
Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff
Makefile
@@ -794,7 +794,7 @@
 quiet_cmd_vmlinux-modpost = LD      $@
       cmd_vmlinux-modpost = $(LD) $(LDFLAGS) -r -o $@                          \
 	 $(vmlinux-init) --start-group $(vmlinux-main) --end-group             \
-	 $(filter-out $(vmlinux-init) $(vmlinux-main) $(vmlinux-lds) FORCE ,$^)
+	 $(filter-out $(vmlinux-init) $(vmlinux-main) FORCE ,$^)
 define rule_vmlinux-modpost
 	:
 	+$(call cmd,vmlinux-modpost)
@@ -818,7 +818,9 @@
 ifdef CONFIG_KALLSYMS
 .tmp_vmlinux1: vmlinux.o
 endif
-vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE
+
+modpost-init := $(filter-out init/built-in.o, $(vmlinux-init))
+vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE
 	$(call if_changed_rule,vmlinux-modpost)
  
 # The actual objects are generated when descending,
...	...	@@ -794,7 +794,7 @@
794	794	quiet_cmd_vmlinux-modpost = LD $@
795	795	cmd_vmlinux-modpost = $(LD) $(LDFLAGS) -r -o $@ \
796	796	$(vmlinux-init) --start-group $(vmlinux-main) --end-group \
797		- $(filter-out $(vmlinux-init) $(vmlinux-main) $(vmlinux-lds) FORCE ,$^)
	797	+ $(filter-out $(vmlinux-init) $(vmlinux-main) FORCE ,$^)
798	798	define rule_vmlinux-modpost
799	799	:
800	800	+$(call cmd,vmlinux-modpost)
...	...	@@ -818,7 +818,9 @@
818	818	ifdef CONFIG_KALLSYMS
819	819	.tmp_vmlinux1: vmlinux.o
820	820	endif
821		-vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE
	821	+
	822	+modpost-init := $(filter-out init/built-in.o, $(vmlinux-init))
	823	+vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE
822	824	$(call if_changed_rule,vmlinux-modpost)
823	825
824	826	# The actual objects are generated when descending,