diff options
| author | Kevin Cernekee <cernekee@gmail.com> | 2011-05-10 18:47:16 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2011-05-11 07:35:35 -0400 |
| commit | 43f67c98161c65f1b2e3af3a9ce6741850072c06 (patch) | |
| tree | 8da16afade0da20113b41ff154736a62f837f94d | |
| parent | 8417da6f2128008c431c7d130af6cd3d9079922e (diff) | |
kbuild: Fix GNU make v3.80 compatibility
According to Documentation/Changes, the kernel should be buildable with
GNU make 3.80+. Commit 88d7be031f9f975bb3f50a0b5ef3796a671e7edf (kbuild:
Use a single clean rule for kernel and external modules) introduced the
"$(or" construct, which requires make 3.81. This causes "make clean" to
malfunction when it is used with external modules.
Replace "$(or" with an equivalent "$(if" expression, to restore backward
compatibility.
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -1398,7 +1398,7 @@ endif # KBUILD_EXTMOD | |||
| 1398 | clean: $(clean-dirs) | 1398 | clean: $(clean-dirs) |
| 1399 | $(call cmd,rmdirs) | 1399 | $(call cmd,rmdirs) |
| 1400 | $(call cmd,rmfiles) | 1400 | $(call cmd,rmfiles) |
| 1401 | @find $(or $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \ | 1401 | @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \ |
| 1402 | \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ | 1402 | \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ |
| 1403 | -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ | 1403 | -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ |
| 1404 | -o -name '*.symtypes' -o -name 'modules.order' \ | 1404 | -o -name '*.symtypes' -o -name 'modules.order' \ |