aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2017-04-22 16:24:11 -0400
committerElliott Sales de Andrade <quantum.analyst@gmail.com>2017-05-05 16:27:01 -0400
commit7d6c6fe166bb2005c3ea22e07308df854c139ee2 (patch)
tree31b505bab1905fb10d50da3c7d04a0f5f8f7b420 /mesonbuild/backend/ninjabackend.py
parent60d560b5a710f5490fa41ca15a8acbdb53cae79a (diff)
downloadmeson-7d6c6fe166bb2005c3ea22e07308df854c139ee2.zip
meson-7d6c6fe166bb2005c3ea22e07308df854c139ee2.tar.gz
meson-7d6c6fe166bb2005c3ea22e07308df854c139ee2.tar.bz2
Remove extra quoting in swiftc invocation.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 59b87a3..af93856 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)