| Message ID | 1553947458-8311-3-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | e07cf4fd7d72546bf46279927b28fe9d74308868 |
| Headers | show |
| Series | [1/6] kbuild: pass $(MAKECMDGOALS) to sub-make as is | expand |
diff --git a/scripts/mkmakefile b/scripts/mkmakefile index 412f13f..31de468 100755 --- a/scripts/mkmakefile +++ b/scripts/mkmakefile @@ -7,12 +7,6 @@ # Usage # $1 - Kernel src directory -# Only overwrite automatically generated Makefiles -# (so we do not overwrite kernel Makefile) -if test -e Makefile && ! grep -q Automatically Makefile -then - exit 0 -fi if [ "${quiet}" != "silent_" ]; then echo " GEN Makefile" fi
This hunk was added to avoid accidental overwrite of the top Makefile in case O= points to the top of the source tree. As commit 4f1127e20437 ("kbuild: fix infinite make recursion"), it caused some troubles in the past because Kbuild assumes O= as out-of-tree build, while it actually works in the source tree. Now this works more properly; if O= points to the source directory, it is handled as in-tree build. So, this sanity check is unneeded. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- scripts/mkmakefile | 6 ------ 1 file changed, 6 deletions(-) -- 2.7.4