diff mbox series

[4/4] kbuild: simplify command line creation in scripts/mkmakefile

Message ID 1537260354-30082-4-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit 80d0dda3a4e5ba00ae6a45fa840096dc9633aad7
Headers show
Series [1/4] kbuild: remove VERSION and PATCHLEVEL from $(objtree)/Makefile | expand

Commit Message

Masahiro Yamada Sept. 18, 2018, 8:45 a.m. UTC 
Assuming we never invoke the generated Makefile from outside of
the $(objtree) directory, $(CURDIR) points to the absolute path
of $(objtree).

BTW, 'lastword' is natively supported by GNU Make 3.81+, which
is the current requirement for building the kernel.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

---

 scripts/mkmakefile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

-- 
2.7.4
diff mbox series

Patch

diff --git a/scripts/mkmakefile b/scripts/mkmakefile
index 85995f9..412f13f 100755
--- a/scripts/mkmakefile
+++ b/scripts/mkmakefile
@@ -20,9 +20,6 @@  fi
 cat << EOF > Makefile
 # Automatically generated by $0: don't edit
 
-lastword = \$(word \$(words \$(1)),\$(1))
-makedir := \$(dir \$(call lastword,\$(MAKEFILE_LIST)))
-
 ifeq ("\$(origin V)", "command line")
 VERBOSE := \$(V)
 endif
@@ -30,15 +27,12 @@  ifneq (\$(VERBOSE),1)
 Q := @
 endif
 
-MAKEARGS := -C $1
-MAKEARGS += O=\$(if \$(patsubst /%,,\$(makedir)),\$(CURDIR)/)\$(patsubst %/,%,\$(makedir))
-
 MAKEFLAGS += --no-print-directory
 
 .PHONY: __sub-make \$(MAKECMDGOALS)
 
 __sub-make:
-	\$(Q)\$(MAKE) \$(MAKEARGS) \$(MAKECMDGOALS)
+	\$(Q)\$(MAKE) -C $1 O=\$(CURDIR) \$(MAKECMDGOALS)
 
 \$(filter-out __sub-make, \$(MAKECMDGOALS)): __sub-make
 	@: