nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1717585 - Switch --enable-bootstrap on by default on central. r=firefox-build-system-reviewers,mhentges

Browse source 
As there are some things to solve first for the sysroot, we don't enable
the sysroot bootstrap unless --enable-bootstrap is given explicitly. The
default will still bootstrap everything else when building on central.

Differential Revision: https://phabricator.services.mozilla.com/D118450
This commit is contained in:
Mike Hommey 2021-06-22 23:36:28 +00:00
parent c9240ccd99
commit 841e1d8a06
2 changed files with 7 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
build/moz.configure/toolchain.configure
View file

@ -931,8 +931,8 @@ bootstrap_sysroot = depends(target_is_linux, sysroot_input)(
)
# We'll re-evaluate later, but for now, don't use the sysroot automatically
# even if it exists, unless --enable-bootstrap was passed, or when building
# on automation.
# even if it exists, unless --enable-bootstrap was passed explicitly, or when
# building on automation.
@depends(
sysroot_input,
bootstrap_path("sysroot", context=target, when=bootstrap_sysroot),
@ -944,7 +944,7 @@ def sysroot_path(sysroot_input, path, bootstrap, automation):
path = sysroot_input[0]
elif sysroot_input is not None and sysroot_input.origin != "default":
return
if sysroot_input or bootstrap or automation:
if sysroot_input or (bootstrap and bootstrap.origin != "default") or automation:
if path:
log.info("Using sysroot in %s", path)
return path

7
moz.configure
View file

@ -193,11 +193,12 @@ def moz_fetches_dir(value):
return value[0]
@depends(host, milestone.is_nightly, "MOZ_AUTOMATION")
def bootstrap_default(host, is_nightly, automation):
@depends(vcs_checkout_type, milestone.is_nightly, "MOZ_AUTOMATION")
def bootstrap_default(vcs_checkout_type, is_nightly, automation):
if automation:
return False
if host.os in ("OSX", "WINNT") and is_nightly:
# We only enable if building off a VCS checkout of central.
if is_nightly and vcs_checkout_type:
return True