aboutsummaryrefslogtreecommitdiff
path: root/backends.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-04-19 21:43:36 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-04-19 21:43:36 +0300
commit7ce4aa1b9051fbcb00db2cd4e197d988e998a703 (patch)
tree521eda2ea8640653c45221e26f8b60d705d0120a /backends.py
parent5d81924914ca5faa0ec79f0d7f6063b5451ef0f8 (diff)
downloadmeson-7ce4aa1b9051fbcb00db2cd4e197d988e998a703.zip
meson-7ce4aa1b9051fbcb00db2cd4e197d988e998a703.tar.gz
meson-7ce4aa1b9051fbcb00db2cd4e197d988e998a703.tar.bz2
Can build programs with MSVC.
Diffstat (limited to 'backends.py')
-rwxr-xr-xbackends.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/backends.py b/backends.py
index aed548c..5d16a64 100755
--- a/backends.py
+++ b/backends.py
@@ -484,10 +484,10 @@ class NinjaBackend(Backend):
for compiler in self.build.compilers:
langname = compiler.get_language()
rule = 'rule %s_LINKER\n' % langname
- command = ' command = %s %s $FLAGS %s $out $in $LINK_FLAGS $aliasing\n' % \
+ command = ' command = %s %s $FLAGS %s $in $LINK_FLAGS $aliasing\n' % \
(execute_wrapper,
- ' '.join(compiler.get_exelist()),\
- ' '.join(compiler.get_output_flags()))
+ ' '.join(compiler.get_linker_exelist()),\
+ ' '.join(compiler.get_linker_output_flags('$out')))
description = ' description = Linking target $out'
outfile.write(rule)
outfile.write(command)
@@ -501,10 +501,10 @@ class NinjaBackend(Backend):
langname = compiler.get_language()
rule = 'rule %s_COMPILER\n' % langname
depflags = compiler.get_dependency_gen_flags('$out', '$DEPFILE')
- command = " command = %s $FLAGS %s %s $out %s $in\n" % \
+ command = " command = %s $FLAGS %s %s %s $in\n" % \
(' '.join(compiler.get_exelist()),\
' '.join([qstr % d for d in depflags]),\
- ' '.join(compiler.get_output_flags()),\
+ ' '.join(compiler.get_output_flags('$out')),\
' '.join(compiler.get_compile_only_flags()))
description = ' description = Compiling %s object $out\n' % langname
dep = ' depfile = $DEPFILE\n'