No vendor < 2.081

src/build.d

@@ -998,21 +998,38 @@ void processEnvironment()
  if (hostDmdInfo.status) // Failed, JSON output currently not supported for GDC
  {
  env["HOST_DMD_KIND"] = "gdc";
- env["HOST_DMD_VERSION"] = "v2.079";
+ env["HOST_DMD_VERSION"] = "v2.076";
  }
  else
  {
- // Reads the content of a single field without parsing the entire JSON
+ /// Reads the content of a single field without parsing the entire JSON
  alias get = field => hostDmdInfo.output
  .findSplitAfter(field ~ `" : "`)[1]
  .findSplitBefore(`"`)[0];
 
- env["HOST_DMD_KIND"] = [
- "Digital Mars D": "dmd",
- "LDC": "ldc",
- "GNU D": "gdc"
- ][get(`vendor`)];
- env["HOST_DMD_VERSION"] = get(`version`)[1 .. "vX.XXX.X".length];
+ const ver = env["HOST_DMD_VERSION"] = get(`version`)[1 .. "vX.XXX.X".length];
+
+ // Vendor was introduced in 2.080
+ if (ver < "2.080.1")
+ {
+ auto name = get("binary").baseName().stripExtension();
+ if (name == "ldmd2")
+ name = "ldc";
+ else if (name == "gdmd")
+ name = "gdc";
+ else
+ enforce(name == "dmd", "Unknown compiler: " ~ name);
+
+ env["HOST_DMD_KIND"] = name;
+ }
+ else
+ {
+ env["HOST_DMD_KIND"] = [
+ "Digital Mars D": "dmd",
+ "LDC": "ldc",
+ "GNU D": "gdc"
+ ][get(`vendor`)];
+ }
  }
 
  env["DMD_PATH"] = env["G"].buildPath("dmd").exeName;