From: Sam Ravnborg <sam@ravnborg.org>
Date: Wed, 13 Feb 2008 21:50:24 +0000 (+0100)
Subject: kbuild: fix building vmlinux.o
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cf87dcd14064e7660f2b11b35b9e4949e9812fd2;p=openwrt%2Fstaging%2Fblogic.git

kbuild: fix building vmlinux.o

Ingo Molnar wrote:
>
> i've got a build log from a weird build error below:
>
>   LD      init/built-in.o
> distcc[12023] ERROR: compile (null) on localhost failed
> make: *** [vmlinux.o] Error 1
> make: *** Waiting for unfinished jobs....
>   LD      .tmp_vmlinux1
>

Building vmlinux.o were moved up in the dependency chain so we started
to build it before the kallsym stuff. This was done to let modpost
report section mismatch bugs even when the final link failed.

Originally I had expected the dependency of $(kallsyms.o) to
cover this but it turns out that we need to be even more explicit.
Fix this by adding a conditional dependency on firat target
used in the kallsyms serie of builds.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Roland McGrath <roland@redhat.com>
---

diff --git a/Makefile b/Makefile
index d73865188372..0d585c09d60c 100644
--- a/Makefile
+++ b/Makefile
@@ -811,7 +811,9 @@ endif
 	$(Q)rm -f .old_version
 
 # build vmlinux.o first to catch section mismatch errors early
-$(kallsyms.o): vmlinux.o
+ifdef CONFIG_KALLSYMS
+.tmp_vmlinux1: vmlinux.o
+endif
 vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE
 	$(call if_changed_rule,vmlinux-modpost)