Skip to content

Commit 0700990

Browse files
committed
make dubCompiler be honored on startup
1 parent a87bbae commit 0700990

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

source/served/extension.d

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,12 @@ void doGlobalStartup(UserConfiguration config)
361361
{
362362
trace("Initializing serve-d for global access");
363363

364+
Configuration.ValueT[string] dubSettings;
365+
if (config.d.dubCompiler.length)
366+
dubSettings["defaultCompiler"] = Configuration.ValueT(config.d.dubCompiler);
367+
364368
backend.globalConfiguration.base = [
369+
"dub": Configuration.Section(dubSettings),
365370
"dcd": Configuration.Section([
366371
"clientPath": Configuration.ValueT(config.dcdClientPath.userPath),
367372
"serverPath": Configuration.ValueT(config.dcdServerPath.userPath),

workspace-d/source/workspaced/com/dub.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class DubComponent : ComponentWrapper
145145
}
146146

147147
if (!_compilerBinaryName.length)
148-
_compilerBinaryName = _dub.defaultCompiler;
148+
_compilerBinaryName = config.get("dub", "defaultCompiler", _dub.defaultCompiler);
149149
setCompiler(_compilerBinaryName);
150150

151151
_settingsTemplate = cast() _dub.project.rootPackage.getBuildSettings();

0 commit comments

Comments
 (0)