From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
To: linux-kbuild@vger.kernel.org,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Douglas Anderson <dianders@chromium.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Matthias Kaehlcke <mka@chromium.org>
Cc: Michal Marek <michal.lkml@markovi.net>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/1] Kbuild: fix # escaping in .cmd files for future Make
Date: Mon, 26 Mar 2018 01:09:16 +0200 [thread overview]
Message-ID: <20180325230918.23161-1-linux@rasmusvillemoes.dk> (raw)
In-Reply-To: <20180325223239.14778-1-linux@rasmusvillemoes.dk>
The latest official Make release is 4.2.1 from mid-2016, but the current
git release has this relevant note in the NEWS file:
* WARNING: Backward-incompatibility!
Number signs (#) appearing inside a macro reference or function invocation
no longer introduce comments and should not be escaped with backslashes:
thus a call such as:
foo := $(shell echo '#')
is legal. Previously the number sign needed to be escaped, for example:
foo := $(shell echo '\#')
Now this latter will resolve to "\#". If you want to write makefiles
portable to both versions, assign the number sign to a variable:
C := \#
foo := $(shell echo '$C')
This was claimed to be fixed in 3.81, but wasn't, for some reason.
To detect this change search for 'nocomment' in the .FEATURES variable.
Prepare for whatever future Make release contains that change by fixing
up the .cmd file escaping - without this, make always thinks the command
string has changed and hence rebuilds everything.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
So the previous patch made everything build, but building again
revealed that this central place very much also needed fixing.
scripts/Kbuild.include | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 065324a8046f..7a926e4688f4 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -10,6 +10,7 @@ space := $(empty) $(empty)
space_escape := _-_SPACE_-_
right_paren := )
left_paren := (
+pound := \#
###
# Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
@@ -328,7 +329,7 @@ endif
# (needed for make)
# Replace >'< with >'\''< to be able to enclose the whole string in '...'
# (needed for the shell)
-make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1)))))
+make-cmd = $(call escsq,$(subst $(pound),\\$(pound),$(subst $$,$$$$,$(cmd_$(1)))))
# Find any prerequisites that is newer than target or that does not exist.
# PHONY targets skipped in both cases.
--
2.15.1
next prev parent reply other threads:[~2018-03-25 23:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-25 22:32 [PATCH] objtool: fix build with " Rasmus Villemoes
2018-03-25 23:09 ` Rasmus Villemoes [this message]
2018-03-26 11:48 ` [PATCH 2/1] Kbuild: fix # escaping in .cmd files for " Masahiro Yamada
2018-04-05 21:43 ` Rasmus Villemoes
2018-04-06 3:53 ` Masahiro Yamada
2018-04-08 21:35 ` [PATCH v2] " Rasmus Villemoes
2018-04-09 13:31 ` Masahiro Yamada
2018-03-25 23:42 ` [PATCH] objtool: fix build with " Randy Dunlap
2018-03-27 5:44 ` 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=20180325230918.23161-1-linux@rasmusvillemoes.dk \
--to=linux@rasmusvillemoes.dk \
--cc=dianders@chromium.org \
--cc=jpoimboe@redhat.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
--cc=mka@chromium.org \
--cc=ndesaulniers@google.com \
--cc=peterz@infradead.org \
--cc=yamada.masahiro@socionext.com \
/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
all inboxes | Powered by JetHome®