]>
Commit | Line | Data |
---|---|---|
a323acb3 GKH |
1 | From b843e4ec01991a386a9e0e9030703524446e03da Mon Sep 17 00:00:00 2001 |
2 | From: Thomas Backlund <tmb@mandriva.org> | |
3 | Date: Thu, 21 Oct 2010 13:19:10 +0300 | |
4 | Subject: microblaze: Fix build with make 3.82 | |
5 | ||
6 | From: Thomas Backlund <tmb@mandriva.org> | |
7 | ||
8 | commit b843e4ec01991a386a9e0e9030703524446e03da upstream. | |
9 | ||
10 | When running make headers_install_all on x86_64 and make 3.82 I hit this: | |
11 | ||
12 | arch/microblaze/Makefile:80: *** mixed implicit and normal rules. Stop. | |
13 | make: *** [headers_install_all] Error 2 | |
14 | ||
15 | So split the rules to satisfy make 3.82. | |
16 | ||
17 | Signed-off-by: Thomas Backlund <tmb@mandriva.org> | |
18 | Signed-off-by: Michal Simek <monstr@monstr.eu> | |
19 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
20 | ||
21 | --- | |
22 | arch/microblaze/Makefile | 8 ++++++-- | |
23 | 1 file changed, 6 insertions(+), 2 deletions(-) | |
24 | ||
25 | --- a/arch/microblaze/Makefile | |
26 | +++ b/arch/microblaze/Makefile | |
27 | @@ -72,12 +72,16 @@ export MMU DTB | |
28 | ||
29 | all: linux.bin | |
30 | ||
31 | -BOOT_TARGETS = linux.bin linux.bin.gz simpleImage.% | |
32 | +# With make 3.82 we cannot mix normal and wildcard targets | |
33 | +BOOT_TARGETS1 = linux.bin linux.bin.gz | |
34 | +BOOT_TARGETS2 = simpleImage.% | |
35 | ||
36 | archclean: | |
37 | $(Q)$(MAKE) $(clean)=$(boot) | |
38 | ||
39 | -$(BOOT_TARGETS): vmlinux | |
40 | +$(BOOT_TARGETS1): vmlinux | |
41 | + $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ | |
42 | +$(BOOT_TARGETS2): vmlinux | |
43 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ | |
44 | ||
45 | define archhelp |