diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-02 19:59:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-02 19:59:00 +0300 |
| commit | 519cd40a064d43e1ce57b60d898a7adabd9e6034 (patch) | |
| tree | 5df3096f16c68325ad9ca78104483e073dcdcd19 /mesonbuild | |
| parent | 51a19521729484b9bd3c42653303a29489c574f1 (diff) | |
| parent | 2dc1e87caeeefa5f15f0b8b6454ee65c18012c06 (diff) | |
| download | meson-519cd40a064d43e1ce57b60d898a7adabd9e6034.zip meson-519cd40a064d43e1ce57b60d898a7adabd9e6034.tar.gz meson-519cd40a064d43e1ce57b60d898a7adabd9e6034.tar.bz2 | |
Merge D feature flag fix branch
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index bfac4c7..2eff796 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2199,6 +2199,11 @@ rule FORTRAN_DEP_HACK # near the end since these are supposed to override everything else. commands += self.escape_extra_args(compiler, target.get_extra_args(compiler.get_language())) + + # D specific additional flags + if compiler.language == 'd': + commands += compiler.get_feature_args(target.d_features, self.build_to_src) + # Add source dir and build dir. Project-specific and target-specific # include paths must override per-target compile args, include paths # from external dependencies, internal dependencies, and from @@ -2292,9 +2297,6 @@ rule FORTRAN_DEP_HACK depelem.write(outfile) commands += compiler.get_module_outdir_args(self.get_target_private_dir(target)) - if compiler.language == 'd': - commands += compiler.get_feature_args(target.d_features, self.build_to_src) - element = NinjaBuildElement(self.all_outputs, rel_obj, compiler_name, rel_src) for d in header_deps: if isinstance(d, File): |