diff options
| author | Pierrick Bouvier <pierrick.bouvier@posteo.net> | 2020-08-28 00:23:11 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-08-30 18:56:24 +0300 |
| commit | 1900720353bd76fa972423f413a206d0a7a42d69 (patch) | |
| tree | 9275994dcc94fdd2a08f357ab79b17178c93687d /mesonbuild | |
| parent | 6fc067344d035c0c16fb33c11f5f0ace5c99c558 (diff) | |
| download | meson-1900720353bd76fa972423f413a206d0a7a42d69.zip meson-1900720353bd76fa972423f413a206d0a7a42d69.tar.gz meson-1900720353bd76fa972423f413a206d0a7a42d69.tar.bz2 | |
D: fix include order
Commit 93c3ec7e introduced a new way to handle deduplication with
compiler args. This resulted in D includes to be reversed.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/compilers/d.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py index 32919e4..a74dc95 100644 --- a/mesonbuild/compilers/d.py +++ b/mesonbuild/compilers/d.py @@ -19,6 +19,7 @@ from ..mesonlib import ( EnvironmentException, MachineChoice, version_compare, ) +from ..arglist import CompilerArgs from .compilers import ( d_dmd_buildtype_args, d_gdc_buildtype_args, @@ -426,6 +427,9 @@ class DmdLikeCompilerMixin: args = [a.replace('-L=', '-Xcc=-Wl,') for a in args] return args +class DCompilerArgs(CompilerArgs): + prepend_prefixes = ('-I', '-L') + dedup2_prefixes = ('-I') class DCompiler(Compiler): mscrt_args = { @@ -599,6 +603,9 @@ class DCompiler(Compiler): args += extra_args return args + def compiler_args(self, args: T.Optional[T.Iterable[str]] = None) -> DCompilerArgs: + return DCompilerArgs(self, args) + def compiles(self, code, env, *, extra_args=None, dependencies=None, mode='compile'): args = self._get_compiler_check_args(env, extra_args, dependencies, mode) |