diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-03 00:48:03 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-03 00:48:03 +0300 |
| commit | 0b0d787624523ef3ab349bd059c5c50dabd1702a (patch) | |
| tree | 5371859316790cb3c5809b01ec75e1ee31a9ac08 /ninjabackend.py | |
| parent | f9060a70bb9333fb6e4b892563e7245afbcd0074 (diff) | |
| download | meson-0b0d787624523ef3ab349bd059c5c50dabd1702a.zip meson-0b0d787624523ef3ab349bd059c5c50dabd1702a.tar.gz meson-0b0d787624523ef3ab349bd059c5c50dabd1702a.tar.bz2 | |
A bunch more conversions.
Diffstat (limited to 'ninjabackend.py')
| -rw-r--r-- | ninjabackend.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index 9258131..cf7db67 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -306,8 +306,8 @@ class NinjaBackend(backends.Backend): cmd += srcs elif i == '@OUTPUT@': cmd += ofilenames - elif i == '@OUTDIR@': - cmd.append(self.get_target_dir(target)) + elif '@OUTDIR@' in i: + cmd.append(i.replace('@OUTDIR@', self.get_target_dir(target))) else: cmd.append(i) @@ -1063,7 +1063,7 @@ rule FORTRAN_DEP_HACK args = [x.replace("@INPUT@", infilename).replace('@OUTPUT@', sole_output)\ for x in base_args] args = self.replace_outputs(args, self.get_target_private_dir_abs(target), outfilelist) - relout = os.path.join(target.subdir, target.get_basename() + target.type_suffix()) + relout = self.get_target_private_dir(target) args = [x.replace("@SOURCE_DIR@", self.build_to_src).replace("@BUILD_DIR@", relout) for x in args] cmdlist = exe_arr + args |