mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-28 06:00:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

build.d: fix range violation with HOST_DMD from environment

Browse source 
A regression introduced in #11671
This commit is contained in:
MoonlightSentinel 2020-09-03 12:18:32 +02:00 • committed by The Dlang Bot
parent 5d73c08219
commit 9e790bcbb9
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/build.d
View file

@ -1004,11 +1004,15 @@ void parseEnvironment()
mkdirRecurse(g); mkdirRecurse(g);
env.setDefault("TOOLS_DIR", dmdRepo.dirName.buildPath("tools")); env.setDefault("TOOLS_DIR", dmdRepo.dirName.buildPath("tools"));
if (env.getDefault("HOST_DMD", null).length == 0) auto hostDmdDef = env.getDefault("HOST_DMD", null);
if (hostDmdDef.length == 0)
{ {
const hostDmd = env.getDefault("HOST_DC", null); const hostDmd = env.getDefault("HOST_DC", null);
env["HOST_DMD"] = hostDmd.length ? hostDmd : "dmd"; env["HOST_DMD"] = hostDmd.length ? hostDmd : "dmd";
} }
else
// HOST_DMD may be defined in the environment
env["HOST_DMD"] = hostDmdDef;
// Auto-bootstrapping of a specific host compiler // Auto-bootstrapping of a specific host compiler
if (env.getNumberedBool("AUTO_BOOTSTRAP")) if (env.getNumberedBool("AUTO_BOOTSTRAP"))