diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-03-30 08:04:15 -0400 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-04-02 10:27:38 -0400 |
commit | e07cf4fd7d72546bf46279927b28fe9d74308868 (patch) | |
tree | ae1f831f68d88b96fe28a85019d3b00fe8768bfa /scripts | |
parent | 25b146c5b8ceecd43c311552d325a4e403c639f2 (diff) |
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>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/mkmakefile | 6 |
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 @@ | |||
7 | # Usage | 7 | # Usage |
8 | # $1 - Kernel src directory | 8 | # $1 - Kernel src directory |
9 | 9 | ||
10 | # Only overwrite automatically generated Makefiles | ||
11 | # (so we do not overwrite kernel Makefile) | ||
12 | if test -e Makefile && ! grep -q Automatically Makefile | ||
13 | then | ||
14 | exit 0 | ||
15 | fi | ||
16 | if [ "${quiet}" != "silent_" ]; then | 10 | if [ "${quiet}" != "silent_" ]; then |
17 | echo " GEN Makefile" | 11 | echo " GEN Makefile" |
18 | fi | 12 | fi |