Skip to content

Commit

Permalink
Add some formatting adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
etcimon committed Jan 9, 2024
1 parent 01a8156 commit b70272f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
6 changes: 2 additions & 4 deletions source/dub/compilers/compiler.d
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,13 @@ interface Compiler {
enforce!CompilerInvocationException(result.status == 0,
format("Failed to invoke the compiler %s to determine the build platform: %s",
compiler_binary, result.output));
BuildPlatform build_platform;

build_platform = readPlatformSDLProbe(result.output);
BuildPlatform build_platform = readPlatformSDLProbe(result.output);
string ver = determineVersion(compiler_binary, result.output).strip;
build_platform.compilerBinary = compiler_binary;

if (ver.empty) {
logWarn(`Could not probe the compiler version for "%s". ` ~
`Toolchain requirements might be ineffective`, build_platform.compiler);
`Toolchain requirements might be ineffective`, build_platform.compiler);
}
else {
build_platform.compilerVersion = ver;
Expand Down
3 changes: 1 addition & 2 deletions source/dub/compilers/utils.d
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ private enum probeEndMark = "__dub_probe_end__";
*/
NativePath generatePlatformProbeFile()
{

import dub.internal.vibecompat.core.file;
import dub.internal.utils;
import std.string : format;
Expand All @@ -278,7 +277,7 @@ NativePath generatePlatformProbeFile()
alias string = const(char)[];
};

// try to not use phobos in the probe to avoid long import times
// avoid druntime so that this compiles without a compiler's builtin object.d
enum probe = q{
%1$s
pragma(msg, `%2$s`);
Expand Down

0 comments on commit b70272f

Please sign in to comment.