Remove maybeVfork

configure.ac

@@ -89,10 +89,6 @@ AC_CHECK_HEADERS([sys/mount.h], [], [],
 ])
 
 
-# Check for vfork.
-#AC_FUNC_FORK()
-
-
 # Check for lutimes, optionally used for changing the mtime of
 # symlinks.
 AC_CHECK_FUNCS([lutimes])

src/libstore/build.cc

@@ -602,7 +602,7 @@ HookInstance::HookInstance()
     builderOut.create();
 
     /* Fork the hook. */
-    pid = maybeVfork();
+    pid = fork();
     switch (pid) {
 
     case -1:
@@ -2781,7 +2781,7 @@ void SubstitutionGoal::tryToRun()
     const char * * argArr = strings2CharPtrs(args);
 
     /* Fork the substitute program. */
-    pid = maybeVfork();
+    pid = fork();
 
     switch (pid) {
 

src/libstore/local-store.cc

@@ -1083,7 +1083,7 @@ void LocalStore::startSubstituter(const Path & substituter, RunningSubstituter &
 
     setSubstituterEnv();
 
-    run.pid = maybeVfork();
+    run.pid = fork();
 
     switch (run.pid) {
 

src/libutil/util.cc

@@ -868,7 +868,7 @@ string runProgram(Path program, bool searchPath, const Strings & args)
 
     /* Fork. */
     Pid pid;
-    pid = maybeVfork();
+    pid = fork();
 
     switch (pid) {
 
@@ -928,13 +928,6 @@ void closeOnExec(int fd)
 }
 
 
-#if HAVE_VFORK
-pid_t (*maybeVfork)() = vfork;
-#else
-pid_t (*maybeVfork)() = fork;
-#endif
-
-
 //////////////////////////////////////////////////////////////////////
 
 

src/libutil/util.hh

@@ -266,9 +266,6 @@ void closeMostFDs(const set<int> & exceptions);
 /* Set the close-on-exec flag for the given file descriptor. */
 void closeOnExec(int fd);
 
-/* Call vfork() if available, otherwise fork(). */
-extern pid_t (*maybeVfork)();
-
 
 /* User interruption. */