From 5133d8650fb12e1635fda6a36794fdff9262bb7a Mon Sep 17 00:00:00 2001 From: Matthias Klumpp Date: Sun, 7 Jan 2018 17:57:43 +0100 Subject: [PATCH] d: Detect recent DMD compilers They now are published by the D Language Foundation, and not Digital Mars. Therefore, their signature has changed slightly. (We can not check for 'DMD', because that string appears in every compiler version output to denote the frontend version used by the compiler). --- mesonbuild/environment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 0c9a2f3ef..e5aa43e9c 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -731,7 +731,7 @@ class Environment: return compilers.LLVMDCompiler(exelist, version, is_cross, full_version=full_version) elif 'gdc' in out: return compilers.GnuDCompiler(exelist, version, is_cross, full_version=full_version) - elif 'Digital Mars' in out: + elif 'The D Language Foundation' in out or 'Digital Mars' in out: return compilers.DmdDCompiler(exelist, version, is_cross, full_version=full_version) raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"')