summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKevin Cernekee <cernekee@gmail.com>2011-05-10 15:47:16 -0700
committerMichal Marek <mmarek@suse.cz>2011-05-11 13:35:35 +0200
commit43f67c98161c65f1b2e3af3a9ce6741850072c06 (patch)
tree8da16afade0da20113b41ff154736a62f837f94d /Makefile
parent8417da6f2128008c431c7d130af6cd3d9079922e (diff)
downloadop-kernel-dev-43f67c98161c65f1b2e3af3a9ce6741850072c06.zip
op-kernel-dev-43f67c98161c65f1b2e3af3a9ce6741850072c06.tar.gz
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5cf4eb0..d96f56e 100644
--- a/Makefile
+++ b/Makefile
@@ -1398,7 +1398,7 @@ endif # KBUILD_EXTMOD
clean: $(clean-dirs)
$(call cmd,rmdirs)
$(call cmd,rmfiles)
- @find $(or $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
+ @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
-o -name '*.symtypes' -o -name 'modules.order' \
OpenPOWER on IntegriCloud