]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
kbuild: do not pass $(objtree) to scripts/mkmakefile
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 18 Sep 2018 08:45:53 +0000 (17:45 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 4 Oct 2018 13:56:02 +0000 (22:56 +0900)
Since $(objtree) is always '.', it is not useful to pass it to
scripts/mkmakefile.  I assume nobody wants to run this script directly.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Makefile
scripts/mkmakefile

index 182172c724412079684154ad81f1d805043c4088..d2de86c2eba38ac7347533c5285453ecf8c0e2e6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -494,7 +494,7 @@ PHONY += outputmakefile
 outputmakefile:
 ifneq ($(KBUILD_SRC),)
        $(Q)ln -fsn $(srctree) source
-       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree) $(objtree)
+       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree)
 endif
 
 ifeq ($(cc-name),clang)
index 24354284d4add8489ee4e396e503d2b9df0d0ae4..85995f90e5c80e7c37775d03a21667b874e59b72 100755 (executable)
@@ -6,19 +6,18 @@
 
 # Usage
 # $1 - Kernel src directory
-# $2 - Output directory
 
 # Only overwrite automatically generated Makefiles
 # (so we do not overwrite kernel Makefile)
-if test -e $2/Makefile && ! grep -q Automatically $2/Makefile
+if test -e Makefile && ! grep -q Automatically Makefile
 then
        exit 0
 fi
 if [ "${quiet}" != "silent_" ]; then
-       echo "  GEN     $2/Makefile"
+       echo "  GEN     Makefile"
 fi
 
-cat << EOF > $2/Makefile
+cat << EOF > Makefile
 # Automatically generated by $0: don't edit
 
 lastword = \$(word \$(words \$(1)),\$(1))