summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mandriva.org>2010-10-21 13:19:10 +0300
committerMichal Simek <monstr@monstr.eu>2010-10-22 15:53:15 +1000
commitb843e4ec01991a386a9e0e9030703524446e03da (patch)
tree75097d58fd55bd03c25a17ea160b0ffa91fe6cf5 /arch
parenta1dfe9c7c9b780865f7a847d3a12fe9214005a58 (diff)
microblaze: Fix build with make 3.82
When running make headers_install_all on x86_64 and make 3.82 I hit this: arch/microblaze/Makefile:80: *** mixed implicit and normal rules. Stop. make: *** [headers_install_all] Error 2 So split the rules to satisfy make 3.82. Signed-off-by: Thomas Backlund <tmb@mandriva.org> Cc: Stable <stable@kernel.org> Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch')
-rw-r--r--arch/microblaze/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index 70a3837c9ba..15f1f1d1840 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -69,12 +69,16 @@ export MMU DTB
all: linux.bin
-BOOT_TARGETS = linux.bin linux.bin.gz simpleImage.%
+# With make 3.82 we cannot mix normal and wildcard targets
+BOOT_TARGETS1 = linux.bin linux.bin.gz
+BOOT_TARGETS2 = simpleImage.%
archclean:
$(Q)$(MAKE) $(clean)=$(boot)
-$(BOOT_TARGETS): vmlinux
+$(BOOT_TARGETS1): vmlinux
+ $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
+$(BOOT_TARGETS2): vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
define archhelp