summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.de>2012-09-20 10:28:45 -0400
committerMichal Marek <mmarek@suse.cz>2012-09-21 13:49:47 +0200
commit24cc7fb69a5b5edfdff1d38c6a213d6a33648829 (patch)
tree08420fb4bf30ea66ffcf49e0845dbd3cfedd0353
parentc1c1a59e37dab22951e25753de0bdf6b9272a4ea (diff)
downloadlinux-stable-24cc7fb69a5b5edfdff1d38c6a213d6a33648829.tar.gz
linux-stable-24cc7fb69a5b5edfdff1d38c6a213d6a33648829.tar.bz2
linux-stable-24cc7fb69a5b5edfdff1d38c6a213d6a33648829.zip
x86/kbuild: archscripts depends on scripts_basic
While building the SUSE kernel packages, which build the scripts, make clean, and then build everything, we have been running into spurious build failures. We tracked them down to a simple dependency issue: $ make mrproper CLEAN arch/x86/tools CLEAN scripts/basic $ cp patches/config/x86_64/desktop .config $ make archscripts HOSTCC arch/x86/tools/relocs /bin/sh: scripts/basic/fixdep: No such file or directory make[3]: *** [arch/x86/tools/relocs] Error 1 make[2]: *** [archscripts] Error 2 make[1]: *** [sub-make] Error 2 make: *** [all] Error 2 This was introduced by commit 6520fe55 (x86, realmode: 16-bit real-mode code support for relocs), which added the archscripts dependency to archprepare. This patch adds the scripts_basic dependency to the x86 archscripts. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--arch/x86/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index b0c5276861ec..c098ca4671de 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -138,7 +138,7 @@ KBUILD_CFLAGS += $(call cc-option,-mno-avx,)
KBUILD_CFLAGS += $(mflags-y)
KBUILD_AFLAGS += $(mflags-y)
-archscripts:
+archscripts: scripts_basic
$(Q)$(MAKE) $(build)=arch/x86/tools relocs
###