diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-11-16 15:29:00 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-11-16 15:29:00 +0200 |
| commit | e0ec0c977f50c63c177c2a6a1e8e8e8bf9d5969e (patch) | |
| tree | 8687d535ff94d5d6986143a310b3427d223a92d8 /ninjabackend.py | |
| parent | 9ce01c16f409208ca17235efee602a71da9712de (diff) | |
| download | meson-e0ec0c977f50c63c177c2a6a1e8e8e8bf9d5969e.zip meson-e0ec0c977f50c63c177c2a6a1e8e8e8bf9d5969e.tar.gz meson-e0ec0c977f50c63c177c2a6a1e8e8e8bf9d5969e.tar.bz2 | |
Do not quote $out or $in because Ninja does it by itself.
Diffstat (limited to 'ninjabackend.py')
| -rw-r--r-- | ninjabackend.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index ad8447d..b21572a 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -901,9 +901,14 @@ rule FORTRAN_DEP_HACK crstr = '' rule = 'rule %s%s_COMPILER\n' % (langname, crstr) depargs = compiler.get_dependency_gen_args('$out', '$DEPFILE') + quoted_depargs = [] + for d in depargs: + if d != '$out' and d != '$in': + d = qstr % d + quoted_depargs.append(d) command = " command = %s $ARGS %s %s %s $in\n" % \ (' '.join(compiler.get_exelist()),\ - ' '.join([qstr % d for d in depargs]),\ + ' '.join(quoted_depargs),\ ' '.join(compiler.get_output_args('$out')),\ ' '.join(compiler.get_compile_only_args())) description = ' description = Compiling %s object $out\n' % langname @@ -927,13 +932,18 @@ rule FORTRAN_DEP_HACK crstr = '' rule = 'rule %s%s_PCH\n' % (langname, crstr) depargs = compiler.get_dependency_gen_args('$out', '$DEPFILE') + quoted_depargs = [] + for d in depargs: + if d != '$out' and d != '$in': + d = qstr % d + quoted_depargs.append(d) if compiler.get_id() == 'msvc': output = '' else: output = ' '.join(compiler.get_output_args('$out')) command = " command = %s $ARGS %s %s %s $in\n" % \ (' '.join(compiler.get_exelist()),\ - ' '.join([qstr % d for d in depargs]),\ + ' '.join(quoted_depargs),\ output,\ ' '.join(compiler.get_compile_only_args())) description = ' description = Precompiling header %s\n' % '$in' |