* Flag `--no-build-hook' to disable distributed builds.

* queryDeriver in daemon mode: don't barf if the other side returns an
  empty string (which means there is no deriver).

1 files changed, 2 insertions, 0 deletions

diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index a606f0dae339..09841e45befb 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -212,6 +212,8 @@ static void initAndRun(int argc, char * * argv)
             readOnlyMode = true;
         else if (arg == "--max-silent-time")
             maxSilentTime = getIntArg(arg, i, args.end());
+        else if (arg == "--no-build-hook")
+            useBuildHook = false;
         else remaining.push_back(arg);
     }