From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-kbuild@vger.kernel.org
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>,
Michal Marek <michal.lkml@markovi.net>,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] kbuild: simplify command line creation in scripts/mkmakefile
Date: Tue, 18 Sep 2018 17:45:54 +0900 [thread overview]
Message-ID: <1537260354-30082-4-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1537260354-30082-1-git-send-email-yamada.masahiro@socionext.com>
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(-)
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
@:
--
2.7.4
next prev parent reply other threads:[~2018-09-18 8:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-18 8:45 [PATCH 1/4] kbuild: remove VERSION and PATCHLEVEL from $(objtree)/Makefile Masahiro Yamada
2018-09-18 8:45 ` [PATCH 2/4] kbuild: remove user ID check in scripts/mkmakefile Masahiro Yamada
2018-09-18 8:45 ` [PATCH 3/4] kbuild: do not pass $(objtree) to scripts/mkmakefile Masahiro Yamada
2018-09-18 8:45 ` Masahiro Yamada [this message]
2018-09-30 13:51 ` [PATCH 1/4] kbuild: remove VERSION and PATCHLEVEL from $(objtree)/Makefile Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1537260354-30082-4-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).