From 7d6c6fe166bb2005c3ea22e07308df854c139ee2 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 22 Apr 2017 16:24:11 -0400 Subject: [PATCH] Remove extra quoting in swiftc invocation. --- mesonbuild/backend/ninjabackend.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 59b87a3b1..af93856f5 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1450,12 +1450,13 @@ int dummy; def generate_swift_compile_rules(self, compiler, outfile): rule = 'rule %s_COMPILER\n' % compiler.get_language() - full_exe = [sys.executable, - self.environment.get_build_command(), + full_exe = [ninja_quote(sys.executable), + ninja_quote(self.environment.get_build_command()), '--internal', 'dirchanger', - '$RUNDIR'] + compiler.get_exelist() - invoc = ' '.join([ninja_quote(i) for i in full_exe]) + '$RUNDIR'] + invoc = (' '.join(full_exe) + ' ' + + ' '.join(ninja_quote(i) for i in compiler.get_exelist())) command = ' command = %s $ARGS $in\n' % invoc description = ' description = Compiling Swift source $in.\n' outfile.write(rule)