зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1614152 - Simplify DUMP_SYMS check, and make it optional. r=dmajor
Differential Revision: https://phabricator.services.mozilla.com/D64282 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
f9434a7b48
Коммит
b543758acf
|
@ -3,10 +3,12 @@
|
|||
# SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE - shouldn't be used?
|
||||
# TOOLTOOL_DIR
|
||||
# MAKECAB - shouldn't be used?
|
||||
# DUMP_SYMS - isn't used.
|
||||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
|
||||
# MinGW does not have (or need) makecab
|
||||
unset MAKECAB
|
||||
unset DUMP_SYMS
|
||||
|
||||
# Sets:
|
||||
# build/mozconfig.common
|
||||
|
|
|
@ -3,10 +3,12 @@
|
|||
# SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE - shouldn't be used?
|
||||
# TOOLTOOL_DIR
|
||||
# MAKECAB - shouldn't be used?
|
||||
# DUMP_SYMS - isn't used.
|
||||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
|
||||
# MinGW does not have (or need) makecab
|
||||
unset MAKECAB
|
||||
unset DUMP_SYMS
|
||||
|
||||
# Sets:
|
||||
# build/mozconfig.common
|
||||
|
|
|
@ -1965,27 +1965,8 @@ set_define('MOZ_FOGOTYPE', True, when=fogotype)
|
|||
# dump_syms
|
||||
# ==============================================================
|
||||
|
||||
option(env='DUMP_SYMS', nargs=1, when=compile_environment & target_is_windows,
|
||||
help='Path to dump_syms')
|
||||
|
||||
@depends('DUMP_SYMS', toolchain_search_path, when=compile_environment & target_is_windows)
|
||||
@checking('for dump_syms')
|
||||
@imports(_from='textwrap', _import='dedent')
|
||||
def dump_syms(dump_syms_override, toolchain_search_path):
|
||||
if dump_syms_override:
|
||||
return dump_syms_override[0]
|
||||
|
||||
program = find_program('dump_syms', paths=toolchain_search_path)
|
||||
|
||||
if program:
|
||||
return program
|
||||
|
||||
raise FatalCheckError(dedent('''\
|
||||
Cannot find dump_syms. Please run `mach bootstrap`, `cargo install dump_syms`,
|
||||
ensure that `dump_syms` is on your PATH, or point at an executable with `DUMP_SYMS`.
|
||||
'''))
|
||||
|
||||
set_config('DUMP_SYMS', dump_syms)
|
||||
check_prog('DUMP_SYMS', ['dump_syms'], allow_missing=True, paths=toolchain_search_path,
|
||||
when=compile_environment & target_is_windows)
|
||||
|
||||
# Fork server
|
||||
@depends(target, build_project)
|
||||
|
|
Загрузка…
Ссылка в новой задаче