summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-03-30 21:04:15 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-04-02 23:27:38 +0900
commite07cf4fd7d72546bf46279927b28fe9d74308868 (patch)
treeae1f831f68d88b96fe28a85019d3b00fe8768bfa
parent25b146c5b8ceecd43c311552d325a4e403c639f2 (diff)
downloadlinux-e07cf4fd7d72546bf46279927b28fe9d74308868.tar.bz2
kbuild: mkmakefile: do not check the generated Makefile marker
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>
-rwxr-xr-xscripts/mkmakefile6
1 files changed, 0 insertions, 6 deletions
diff --git a/scripts/mkmakefile b/scripts/mkmakefile
index 412f13fdff52..31de46801321 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