[PATCH] [39/223] microblaze: Fix build with make 3.82

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Andi Kleen
Date: Sunday, December 12, 2010 - 4:45 pm

2.6.35-longterm review patch.  If anyone has any objections, please let me know.

------------------
From: Thomas Backlund <tmb@mandriva.org>

commit b843e4ec01991a386a9e0e9030703524446e03da upstream.

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>
Signed-off-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>

---
 arch/microblaze/Makefile |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Index: linux/arch/microblaze/Makefile
===================================================================
--- linux.orig/arch/microblaze/Makefile
+++ linux/arch/microblaze/Makefile
@@ -72,12 +72,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
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] [0/223] 2.6.35.10 longterm review, Andi Kleen, (Sun Dec 12, 4:44 pm)
[PATCH] [10/223] cfg80211: fix BSS double-unlinking, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [11/223] cfg80211: fix locking, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [39/223] microblaze: Fix build with make 3.82, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [42/223] NFSv4: Fix open recovery, Andi Kleen, (Sun Dec 12, 4:45 pm)
Re: [PATCH] [0/223] 2.6.35.10 longterm review, Randy Dunlap, (Thu Dec 16, 10:42 am)