From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>
Subject: [PATCH] ninjatool: quote dollars in variables
Date: Wed, 26 Aug 2020 15:01:28 -0400 [thread overview]
Message-ID: <20200826190128.22707-1-pbonzini@redhat.com> (raw)
Otherwise, dollars (such as in the special $ORIGIN rpath) are
eaten by Make.
Reported-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
scripts/ninjatool.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py
index cc77d51aa8..c33eafb5a0 100755
--- a/scripts/ninjatool.py
+++ b/scripts/ninjatool.py
@@ -834,7 +834,8 @@ class Ninja2Make(NinjaParserEventsWithVars):
self.print()
for targets in self.build_vars:
for name, value in self.build_vars[targets].items():
- self.print('%s: private .var.%s := %s' % (targets, name, value))
+ self.print('%s: private .var.%s := %s' %
+ (targets, name, value.replace('$', '$$')))
self.print()
if not self.seen_default:
default_targets = sorted(self.all_outs - self.all_ins, key=natural_sort_key)
--
2.26.2
next reply other threads:[~2020-08-26 19:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-26 19:01 Paolo Bonzini [this message]
2020-08-26 19:34 ` [PATCH] ninjatool: quote dollars in variables Peter Maydell
2020-08-27 4:13 ` Paolo Bonzini
2020-08-27 5:29 ` Alexander Bulekov
2020-08-27 7:33 ` Laurent Vivier
2020-08-27 8:22 ` Paolo Bonzini
2020-08-27 9:10 ` Paolo Bonzini
2020-08-27 9:14 ` Paolo Bonzini
2020-08-27 10:07 ` Peter Maydell
2020-08-27 12:02 ` Paolo Bonzini
2020-08-28 18:57 ` Laurent Vivier
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=20200826190128.22707-1-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=lvivier@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).