commit bec33ba3f2bb398a52e76492d454cc8ef25ccc80
author Boris Bügling <bbuegling@apple.com> Sun Jan 15 16:39:56 2017 +0100
committer GitHub <noreply@github.com> Sun Jan 15 16:39:56 2017 +0100
tree 10e9118ea08ffed2fef5e5160d62feb5c0adf554
parent fd9448e50d814a9f9e32da69db8b38a3cebdf60c
parent 9afedbaf2ef3be707fd22df06d5bf2c6261a0f4b

Merge pull request #70 from neonichu/fix-command-task-cancellation

Call `taskIsComplete()` on CommandTask cancellation

lib/BuildSystem/BuildSystem.cpp

diff --git a/lib/BuildSystem/BuildSystem.cpp b/lib/BuildSystem/BuildSystem.cpp
index 8c6dde9..ba50b33 100644
--- a/lib/BuildSystem/BuildSystem.cpp
+++ b/lib/BuildSystem/BuildSystem.cpp
@@ -533,6 +533,12 @@
   }
 
   virtual void inputsAvailable(BuildEngine& engine) override {
+    // If the build should cancel, do nothing.
+    if (isCancelled(engine)) {
+      engine.taskIsComplete(this, BuildValue::makeSkippedCommand().toData());
+      return;
+    }
+
     auto& bsci = getBuildSystem(engine).getCommandInterface();
     auto fn = [this, &bsci=bsci](QueueJobContext* context) {
       bool shouldSkip = !bsci.getDelegate().shouldCommandStart(&command);