summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Klumpp <matthias@tenstral.net>2018-01-07 17:57:43 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2018-01-07 19:52:07 +0200
commit5133d8650fb12e1635fda6a36794fdff9262bb7a (patch)
treebb8ae50a5dc0914c12981d3ed2b73c717c440456
parent392b3d8bc774120a20595ed3faf135db53f850c2 (diff)
downloadmeson-5133d8650fb12e1635fda6a36794fdff9262bb7a.tar.gz
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).
-rw-r--r--mesonbuild/environment.py2
1 files changed, 1 insertions, 1 deletions
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) + '"')