Bug 1363655 - part 3 - remove stylo.build key in favor of stylo_config.build; r=rillian
authorNathan Froyd <froydnj@mozilla.com>
Wed, 21 Jun 2017 13:28:37 -0400
changeset 414065 ae3346e96d470444ff6dbb28891227f632c5ad71
parent 414064 5d8ef49108c1e2facf0b91799c1fb7caf909e628
child 414066 45f92bb6cf01b2aa14922a99da5240aa94f95529
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrillian
bugs1363655
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1363655 - part 3 - remove stylo.build key in favor of stylo_config.build; r=rillian stylo.build is just a copy of stylo_config.build, so we should use the former to limit the number of duplicate concepts we have. Using stylo_config consistently enables us to separate out what artifact builds need vs. non-artifact builds.
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -769,24 +769,23 @@ def stylo(stylo_config, bindgen_config_p
         Could not find LLVM/Clang installation for compiling stylo build-time
         bindgen.  Please specify the 'LLVM_CONFIG' environment variable
         (recommended), pass the '--with-libclang-path' and '--with-clang-path'
         options to configure, or put 'llvm-config' in your PATH.  Altering your
         PATH may expose 'clang' as well, potentially altering your compiler,
         which may not be what you intended.'''))
 
     return namespace(
-        build=bool(stylo_config.build),
         libclang_path=bindgen_config_paths.libclang_path,
         clang_path=bindgen_config_paths.clang_path,
         bindgen_enabled=bool(bindgen_enabled),
     )
 
-set_config('MOZ_STYLO', stylo.build)
-set_define('MOZ_STYLO', stylo.build)
+set_config('MOZ_STYLO', stylo_config.build)
+set_define('MOZ_STYLO', stylo_config.build)
 set_config('MOZ_STYLO_ENABLE', stylo_config.enable)
 set_define('MOZ_STYLO_ENABLE', stylo_config.enable)
 
 set_config('MOZ_LIBCLANG_PATH', stylo.libclang_path)
 set_config('MOZ_CLANG_PATH', stylo.clang_path)
 set_config('MOZ_STYLO_BINDGEN', stylo.bindgen_enabled)
 
 option('--with-servo', env='SERVO_TARGET_DIR', nargs=1,