diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-29 22:32:48 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-29 22:32:48 +0300 |
| commit | 1d89d091f89986b4a5c04614c08e8c6928ff4432 (patch) | |
| tree | 3b2628b54d6b598c7e81e355f45ac58ec6139499 /mesonbuild/backend/ninjabackend.py | |
| parent | 5ea24bafddd66fa0426d4eeb59ee90531f099baf (diff) | |
| parent | a33d9d56cf72e493e2176b33e95afa8921f26e06 (diff) | |
| download | meson-1d89d091f89986b4a5c04614c08e8c6928ff4432.zip meson-1d89d091f89986b4a5c04614c08e8c6928ff4432.tar.gz meson-1d89d091f89986b4a5c04614c08e8c6928ff4432.tar.bz2 | |
Merge branch 'vs-extraargs'
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 7c430bf..f5c992c 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1348,13 +1348,7 @@ rule FORTRAN_DEP_HACK relout = self.get_target_private_dir(target) args = [x.replace("@SOURCE_DIR@", self.build_to_src).replace("@BUILD_DIR@", relout) for x in args] - final_args = [] - for a in args: - if a == '@EXTRA_ARGS@': - final_args += genlist.get_extra_args() - else: - final_args.append(a) - cmdlist = exe_arr + final_args + cmdlist = exe_arr + self.replace_extra_args(args, genlist) elem = NinjaBuildElement(self.all_outputs, outfiles, 'CUSTOM_COMMAND', infilename) if len(extra_dependencies) > 0: elem.add_dep(extra_dependencies) |