aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Klumpp <matthias@tenstral.net>2018-03-31 20:53:27 +0200
committerMatthias Klumpp <matthias@tenstral.net>2018-03-31 20:53:27 +0200
commit2dc1e87caeeefa5f15f0b8b6454ee65c18012c06 (patch)
treefafdf31f539fcf71d117456f01f4f3aa582b6643
parentad2ab56e5f000d8be05e3e6d780e3aab00fddbce (diff)
downloadmeson-2dc1e87caeeefa5f15f0b8b6454ee65c18012c06.zip
meson-2dc1e87caeeefa5f15f0b8b6454ee65c18012c06.tar.gz
meson-2dc1e87caeeefa5f15f0b8b6454ee65c18012c06.tar.bz2
Ensure D feature flags get applied to all D files
This resolves issue #3337
-rw-r--r--mesonbuild/backend/ninjabackend.py8
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):