From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Thu, 22 Aug 2019 04:46:10 +0000 (+0900)
Subject: kbuild: clarify where to run make mrproper when out-of-tree fails
X-Git-Tag: v5.4-rc1~105^2~22
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1a475d5486755fcf48d710cb7dc3a8a5f7bad573;p=users%2Fwilly%2Fxarray.git

kbuild: clarify where to run make mrproper when out-of-tree fails

If you try out-of-tree build with an unclean source tree, Kbuild
suggests to run make mrproper. The path to the source tree may be
shown with a relative path, for example, "make O=foo" emits the
following:

  .. is not clean, please run 'make mrproper'
  in the '..' directory.

This is somewhat confusing if you ran "make O=foo" in the source tree.
Using the absolute path will be clearer.

This commit changes the error message like follows:

***
*** The source tree is not clean, please run 'make mrproper'
*** in /absolute/path/to/linux
***

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/Makefile b/Makefile
index d5d0742efeb2..132cc1209781 100644
--- a/Makefile
+++ b/Makefile
@@ -1118,8 +1118,10 @@ 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$(if $(findstring command line, $(origin ARCH)), ARCH=$(ARCH)) mrproper'"; \
-		echo >&2 "  in the '$(srctree)' directory.";\
+		echo >&2 "***"; \
+		echo >&2 "*** The source tree is not clean, please run 'make$(if $(findstring command line, $(origin ARCH)), ARCH=$(ARCH)) mrproper'"; \
+		echo >&2 "*** in $(abs_srctree)";\
+		echo >&2 "***"; \
 		/bin/false; \
 	fi;
 endif