about summary refs log tree commit diff
path: root/src/libmain
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2010-02-03T21·38+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2010-02-03T21·38+0000
commit4e17be7981026f0317fb12f166282be2d972889e (patch)
treeeb24809ed97bee6275aaa16a1b65764d411071cf /src/libmain
parentf859a8d3c33cc275f41d983bfeff2a21a9f88f1b (diff)
* Revert r19797, and use a simpler solution: just don't monitor build
  hooks for silence.  It's unnecessary because the remote nix-store
  command is already monitoring the real build.

Diffstat (limited to 'src/libmain')
-rw-r--r--src/libmain/shared.cc13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index d48e2ad696..d9cf9a8626 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -31,11 +31,6 @@ static void sigintHandler(int signo)
 }
 
 
-static void sigalrmHandler(int signo)
-{
-}
-
-
 Path makeRootName(const Path & gcRoot, int & counter)
 {
     counter++;
@@ -165,14 +160,6 @@ static void initAndRun(int argc, char * * argv)
     if (sigaction(SIGPIPE, &act, 0))
         throw SysError("ignoring SIGPIPE");
 
-    /* Catch SIGALRM with an empty handler (we just need it to get an
-       EINTR from blocking system calls). */
-    act.sa_handler = sigalrmHandler;
-    sigfillset(&act.sa_mask);
-    act.sa_flags = 0;
-    if (sigaction(SIGALRM, &act, 0))
-        throw SysError("installing handler for SIGALRM");
-
     /* Reset SIGCHLD to its default. */
     act.sa_handler = SIG_DFL;
     act.sa_flags = 0;