diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index bc7ec93ca8af..9b16ca0980ac 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -436,13 +436,14 @@ macro_rules! tool_extended {
 
             fn run($sel, $builder: &Builder) -> Option<PathBuf> {
                 $extra_deps
+                let toolstate = $builder.build.config.toolstate.$toolstate;
                 $builder.ensure(ToolBuild {
                     compiler: $sel.compiler,
                     target: $sel.target,
                     tool: $tool_name,
                     mode: Mode::Librustc,
                     path: $path,
-                    expectation: $builder.build.config.toolstate.$toolstate.passes(ToolState::Compiling),
+                    expectation: toolstate.passes(ToolState::Compiling),
                 })
             }
         }