From 29225468b3cbdfb0056127dab8a78413e94de020 Mon Sep 17 00:00:00 2001 From: Tooru Fujisawa Date: Tue, 14 Jun 2022 18:13:53 +0000 Subject: [PATCH] Bug 1769405 - Part 1: Move artifact build option to build/moz.configure/init.configure. r=glandium Differential Revision: https://phabricator.services.mozilla.com/D147011 --- build/moz.configure/init.configure | 18 ++++++++++++++++++ moz.configure | 15 --------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 81f500a0b7527..cebdfc52ad76b 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -402,6 +402,24 @@ def default_project(build_env, js_package): option("--enable-project", nargs=1, default=default_project, help="Project to build") +# Artifact builds +# ============================================================== + +option( + "--enable-artifact-builds", + env="MOZ_ARTIFACT_BUILDS", + help="Download and use prebuilt binary artifacts.", +) + + +@depends("--enable-artifact-builds") +def artifact_builds(value): + if value: + return True + + +set_config("MOZ_ARTIFACT_BUILDS", artifact_builds) + # Host and target systems # ============================================================== option("--host", nargs=1, help="Define the system type performing the build") diff --git a/moz.configure b/moz.configure index 8b74afbabec18..bab601180deb0 100755 --- a/moz.configure +++ b/moz.configure @@ -14,21 +14,6 @@ include("build/moz.configure/init.configure") # - Spidermonkey-specific options and rules should go in js/moz.configure. # - etc. -option( - "--enable-artifact-builds", - env="MOZ_ARTIFACT_BUILDS", - help="Download and use prebuilt binary artifacts.", -) - - -@depends("--enable-artifact-builds") -def artifact_builds(value): - if value: - return True - - -set_config("MOZ_ARTIFACT_BUILDS", artifact_builds) - imply_option( "--enable-artifact-build-symbols", depends(artifact_builds)(lambda v: False if v is None else None),