From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 26 Aug 2020 15:02:03 +0000 (+0200)
Subject: ninjatool: quote dollars in variables
X-Git-Tag: v5.2.0-rc0~153^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a4db552d8;p=thirdparty%2Fqemu.git

ninjatool: quote dollars in variables

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>
---

diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py
index cc77d51aa84..c33eafb5a05 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)