summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2019-07-09 15:26:39 +0200
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-07-10 17:05:09 +0200
commit3a475b2166fd6aa5ac76e8c605dffdf7a2a457ee (patch)
treec0e61588da2921d41e68f046c6a886fa155a3c3d /Makefile
parentkbuild: fix compression errors getting ignored (diff)
downloadlinux-3a475b2166fd6aa5ac76e8c605dffdf7a2a457ee.tar.xz
linux-3a475b2166fd6aa5ac76e8c605dffdf7a2a457ee.zip
kbuild: Inform user to pass ARCH= for make mrproper
When cross-compiling an out-of-tree build with an unclean source tree directory, the build fails with: /path/to/kernel/source/tree is not clean, please run 'make mrproper' in the '/path/to/kernel/source/tree' directory. However, doing so does not fix the problem, as "make mrproper" now requires passing the target architecture to the make command, else it won't remove $(srctree)/arch/$(SRCARCH)/include/generated. "git ls-files -o" doesn't give a clue, as it doesn't list (empty) directories, only files. Improve usability by including the ARCH= option in the error output. Fixes: a788b2ed81ab ("kbuild: check arch/$(SRCARCH)/include/generated before out-of-tree build") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 357fd3623144..d076840904e2 100644
--- a/Makefile
+++ b/Makefile
@@ -1107,7 +1107,7 @@ ifdef building_out_of_srctree
$(Q)if [ -f $(srctree)/.config -o \
-d $(srctree)/include/config -o \
-d $(srctree)/arch/$(SRCARCH)/include/generated ]; then \
- echo >&2 " $(srctree) is not clean, please run 'make mrproper'"; \
+ echo >&2 " $(srctree) is not clean, please run 'make ARCH=$(ARCH) mrproper'"; \
echo >&2 " in the '$(srctree)' directory.";\
/bin/false; \
fi;