1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Support/Program.cpp b/lib/Support/Program.cpp
index 83f2ec4f0f..913c099791 100644
--- a/lib/Support/Program.cpp
+++ b/lib/Support/Program.cpp
@@ -34,7 +34,8 @@ int sys::ExecuteAndWait(StringRef Program, const char **args, const char **envp,
   if (Execute(PI, Program, args, envp, redirects, memoryLimit, ErrMsg)) {
     if (ExecutionFailed)
       *ExecutionFailed = false;
-    ProcessInfo Result = Wait(PI, secondsToWait, true, ErrMsg);
+    ProcessInfo Result = Wait(
+        PI, secondsToWait, /*WaitUntilTerminates=*/secondsToWait == 0, ErrMsg);
     return Result.ReturnCode;
   }