Backed out changeset 84184c894e33 (bug 1609881) for multiple failures e.g assertion failure StaticPrefList_layers.h on a CLOSED TREE

moz.configure

@@ -634,6 +634,20 @@ llvm_objdump = check_prog('LLVM_OBJDUMP', llvm_objdump, what='llvm-objdump',
 
 add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump)
 
+# Fork server
+option('--enable-forkserver', env='MOZ_ENABLE_FORKSERVER', help='Enable fork server')
+
+@depends('--enable-forkserver', target)
+def forkserver_flag(value, target):
+    if target.os == 'Android' or \
+       (target.os == 'GNU' and target.kernel == 'Linux') or \
+       target.os == 'FreeBSD':
+        return bool(value)
+    pass
+
+set_config('MOZ_ENABLE_FORKSERVER', forkserver_flag)
+set_define('MOZ_ENABLE_FORKSERVER', forkserver_flag, forkserver_flag)
+
 
 # Please do not add configure checks from here on.
 

toolkit/moz.configure

@@ -1972,24 +1972,3 @@ def dump_syms(dump_syms_override, toolchain_search_path):
     '''))
 
 set_config('DUMP_SYMS', dump_syms)
-
-# Fork server
-@depends(target, build_project)
-def forkserver_default(target, build_project):
-    return build_project == 'browser' and \
-        ((target.os == 'GNU' and target.kernel == 'Linux') or \
-         target.os == 'FreeBSD')
-
-option('--enable-forkserver', default=forkserver_default,
-       env='MOZ_ENABLE_FORKSERVER', help='Enable fork server')
-
-@depends('--enable-forkserver', target)
-def forkserver_flag(value, target):
-    if target.os == 'Android' or \
-       (target.os == 'GNU' and target.kernel == 'Linux') or \
-       target.os == 'FreeBSD':
-        return bool(value)
-    pass
-
-set_config('MOZ_ENABLE_FORKSERVER', forkserver_flag)
-set_define('MOZ_ENABLE_FORKSERVER', forkserver_flag, forkserver_flag)