diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-09-05 18:52:17 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-09-05 18:52:17 +0300 |
| commit | d79b8a19a06ef4b0957acd7295434b0726b4d7d0 (patch) | |
| tree | a6d257963d6dab900a3bf3a6f4487a545574c4d9 /ninjabackend.py | |
| parent | 3ed22fcc56877ca974e31b7fd80343b126f866aa (diff) | |
| download | meson-d79b8a19a06ef4b0957acd7295434b0726b4d7d0.zip meson-d79b8a19a06ef4b0957acd7295434b0726b4d7d0.tar.gz meson-d79b8a19a06ef4b0957acd7295434b0726b4d7d0.tar.bz2 | |
Made include args always return arrays for consistency.
Diffstat (limited to 'ninjabackend.py')
| -rw-r--r-- | ninjabackend.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index 08e43b4..1ab107c 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -1062,7 +1062,7 @@ rule FORTRAN_DEP_HACK extra_orderdeps = [] compiler = self.get_compiler_for_source(src) commands = self.generate_basic_compiler_args(target, compiler) - commands.append(compiler.get_include_arg(self.get_target_private_dir(target))) + commands += compiler.get_include_args(self.get_target_private_dir(target)) if isinstance(src, RawFilename): rel_src = src.fname elif is_generated: @@ -1100,10 +1100,10 @@ rule FORTRAN_DEP_HACK for d in i.get_incdirs(): expdir = os.path.join(basedir, d) fulldir = os.path.join(self.environment.get_source_dir(), expdir) - barg = compiler.get_include_arg(expdir) - sarg = compiler.get_include_arg(fulldir) - commands.append(barg) - commands.append(sarg) + bargs = compiler.get_include_args(expdir) + sargs = compiler.get_include_args(fulldir) + commands += bargs + commands += sargs if self.environment.coredata.use_pch: commands += self.get_pch_include_args(compiler, target) crstr = '' @@ -1121,7 +1121,7 @@ rule FORTRAN_DEP_HACK if srcfile == src: depelem = NinjaBuildElement(modfile, 'FORTRAN_DEP_HACK', rel_obj) depelem.write(outfile) - commands.append(compiler.get_module_outdir_arg(os.path.join(self.get_target_dir(target), target.get_basename() + '.dir'))) + commands += compiler.get_module_outdir_args(os.path.join(self.get_target_dir(target), target.get_basename() + '.dir')) element = NinjaBuildElement(rel_obj, compiler_name, rel_src) for d in header_deps: |