aboutsummaryrefslogtreecommitdiff
path: root/backends.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-03-08 19:10:52 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2013-03-08 19:10:52 +0200
commitc89aa41a3f715270e0281057aedefb72163e7cf0 (patch)
tree1e63fb8e2722700c43698879a7e3d55dda7c4c7a /backends.py
parent3a320036ce836a1cf459e5311f4639bdc272c628 (diff)
downloadmeson-c89aa41a3f715270e0281057aedefb72163e7cf0.zip
meson-c89aa41a3f715270e0281057aedefb72163e7cf0.tar.gz
meson-c89aa41a3f715270e0281057aedefb72163e7cf0.tar.bz2
Unit test pass on Windows.
Diffstat (limited to 'backends.py')
-rwxr-xr-xbackends.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/backends.py b/backends.py
index 29ee420..d237e76 100755
--- a/backends.py
+++ b/backends.py
@@ -21,8 +21,10 @@ from meson_install import InstallData
if environment.is_windows():
quote_char = '"'
+ execute_wrapper = 'cmd /c'
else:
quote_char = "'"
+ execute_wrapper = ''
def shell_quote(cmdlist):
return ["'" + x + "'" for x in cmdlist]
@@ -401,8 +403,9 @@ class NinjaBackend(Backend):
for compiler in self.build.compilers:
langname = compiler.get_language()
rule = 'rule %s_LINKER\n' % langname
- command = ' command = %s $FLAGS %s $out $in $LINK_FLAGS $aliasing\n' % \
- (' '.join(compiler.get_exelist()),\
+ command = ' command = %s %s $FLAGS %s $out $in $LINK_FLAGS $aliasing\n' % \
+ (execute_wrapper,
+ ' '.join(compiler.get_exelist()),\
' '.join(compiler.get_output_flags()))
description = ' description = Linking target $out'
outfile.write(rule)