Skip to content

Avoid creation of a temporary probe file for newer compilers #1316

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

Open
wilzbach wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid creation of a temporary probe file for newer compilers #1316

Show file tree
Hide file tree
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: 41 additions & 7 deletions source/dub/compilers/compiler.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,19 +115,53 @@ interface Compiler {
enforce(status == 0, format("%s failed with exit code %s.", args[0], status));
}

/** Detect the frontend version of a compiler_binary
Returns: 0 if the detection failed, otherwise the frontend version.
Note: This only works for DMD and LDC.
*/
private int frontendVersion(string compiler_binary)
{
import std.range : dropOne;

auto res = execute([compiler_binary, "--version"]);
if (res.status == 0) {
auto versionRange = res.output.find("DMD64 D Compiler v").splitter(".");
if (!versionRange.empty && !versionRange.dropOne.empty) {
return versionRange.dropOne.front.to!int;
}
}
return 0;
}

// DMD 2.076.0 and newer support passing files via stdin
private bool canUseStdin(string compiler_binary)
{
return frontendVersion(compiler_binary) >= 76 && compiler_binary.startsWith("dmd");
}

/// Compiles platform probe file with the specified compiler and parses its output.
protected final BuildPlatform probePlatform(string compiler_binary, string[] args, string arch_override)
{
import std.string : format;
import dub.compilers.utils : generatePlatformProbeFile, readPlatformProbe;
import dub.compilers.utils : generatePlatformProbeFile, readPlatformProbe, platformProbeFile;

auto fil = generatePlatformProbeFile();
bool canUseStdin = this.canUseStdin(compiler_binary);
string fil = canUseStdin ? generatePlatformProbeFile().toNativeString() : "-";
Copy link
Contributor Author

@wilzbach wilzbach Dec 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course we could also remove the temp file after the exit of the current scope.


auto result = executeShell(escapeShellCommand(compiler_binary ~ args ~ fil.toNativeString()));
enforce(result.status == 0, format("Failed to invoke the compiler %s to determine the build platform: %s",
compiler_binary, result.output));

auto build_platform = readPlatformProbe(result.output);
auto p = pipeShell(escapeShellCommand(compiler_binary ~ args ~ fil), Redirect.all);
if (canUseStdin) {
p.stdin.write(platformProbeFile);
p.stdin.close;
}
// read stdout
string output;
auto app = appender!(ubyte[]);
p.stderr.byChunk(4096).each!(a => app.put(a));
output = cast(string) app.data;
enforce(p.pid.wait== 0, format("Failed to invoke the compiler %s to determine the build platform: %s",
compiler_binary, output));

auto build_platform = readPlatformProbe(output);
build_platform.compilerBinary = compiler_binary;

if (build_platform.compiler != this.name) {
Expand Down
22 changes: 16 additions & 6 deletions source/dub/compilers/utils.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,21 @@ NativePath generatePlatformProbeFile()
fil.close();
}

fil.write(q{
fil.write(platformProbeFile);
fil.close();

return path;
}


/**
Platform probe file that will give, at compile time, information about the compiler (architecture, frontend version...)

See_Also: `generatePlatformProbeFile`, `readPlatformProbe`
*/
string platformProbeFile()
{
return q{
module dub_platform_probe;
import std.array;

Expand All @@ -279,11 +293,7 @@ NativePath generatePlatformProbeFile()
string determineArchitecture() } ~ '{' ~ archCheck ~
` return '"' ~ ret.data.join("\", \"") ~ "\", "; }` ~ q{

string determineCompiler() } ~ '{' ~ compilerCheck ~ " }");

fil.close();

return path;
string determineCompiler() } ~ '{' ~ compilerCheck ~ " }";
}

/**
Expand Down