From 1900720353bd76fa972423f413a206d0a7a42d69 Mon Sep 17 00:00:00 2001 From: Pierrick Bouvier Date: Fri, 28 Aug 2020 00:23:11 +0200 Subject: D: fix include order Commit 93c3ec7e introduced a new way to handle deduplication with compiler args. This resulted in D includes to be reversed. --- mesonbuild/compilers/d.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'mesonbuild') 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) -- cgit v1.1