Skip to content

Commit

Permalink
Bug 1609881 - Part 2: build the fork server for Linux & FreeBSD. r=gs…
Browse files Browse the repository at this point in the history
…velto

Differential Revision: https://phabricator.services.mozilla.com/D61255
  • Loading branch information
ThinkerYzu1 committed Feb 12, 2020
1 parent 81cc00d commit 1204715
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 14 deletions.
14 changes: 0 additions & 14 deletions moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -634,20 +634,6 @@ 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.

Expand Down
21 changes: 21 additions & 0 deletions toolkit/moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -1972,3 +1972,24 @@ 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)

0 comments on commit 1204715

Please sign in to comment.