Skip to content

Commit

Permalink
kbuild: mkmakefile: do not check the generated Makefile marker
Browse files Browse the repository at this point in the history
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 4f1127e ("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 <[email protected]>
  • Loading branch information
masahir0y committed Apr 2, 2019
1 parent 25b146c commit e07cf4f
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions scripts/mkmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e07cf4f

Please sign in to comment.