Skip to content

[RFC] build.d: Use JSON output to detect host compiler #11639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilzbach merged 1 commit into from
Aug 30, 2020
Merged

[RFC] build.d: Use JSON output to detect host compiler #11639

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 36 additions & 12 deletions src/build.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,21 +991,45 @@ void processEnvironment()

const os = env["OS"];

const hostDMDVersion = [env["HOST_DMD_RUN"], "--version"].execute.output;
// Detect the host compiler kind and version
const hostDmdInfo = [env["HOST_DMD_RUN"], `-Xi=compilerInfo`, `-Xf=-`].execute();

alias DMD = AliasSeq!("DMD");
alias LDC = AliasSeq!("LDC");
alias GDC = AliasSeq!("GDC", "gdmd", "gdc");
const kindIdx = hostDMDVersion.canFind(DMD, LDC, GDC);
if (hostDmdInfo.status) // Failed, JSON output currently not supported for GDC
{
env["HOST_DMD_KIND"] = "gdc";
env["HOST_DMD_VERSION"] = "v2.076";
}
else
{
/// Reads the content of a single field without parsing the entire JSON
alias get = field => hostDmdInfo.output
.findSplitAfter(field ~ `" : "`)[1]
.findSplitBefore(`"`)[0];

enforce(kindIdx, "Invalid Host DMD found: " ~ hostDMDVersion);
const ver = env["HOST_DMD_VERSION"] = get(`version`)[1 .. "vX.XXX.X".length];

if (kindIdx <= DMD.length)
env["HOST_DMD_KIND"] = "dmd";
else if (kindIdx <= LDC.length + DMD.length)
env["HOST_DMD_KIND"] = "ldc";
else
env["HOST_DMD_KIND"] = "gdc";
// 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;
env.getDefault("DETAB", "detab");
Expand Down