Bug 1363655 - part 6 - remove the `stylo` configure function; r=rillian
authorNathan Froyd <froydnj@mozilla.com>
Wed, 21 Jun 2017 13:28:37 -0400
changeset 414068 ff90fedc24b28f56b8fbee37652650d65f2595a9
parent 414067 f8c24ace77cb96cd1bc0f134cdcd7cd878608bfe
child 414069 247d01ab53c74c3e4ea7b36964cef31b87380b9a
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 6 - remove the `stylo` configure function; r=rillian After the previous set of patches, it's just a bloated wrapper for bindgen_config_paths.
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -754,38 +754,23 @@ def bindgen_config_paths(llvm_config, li
         The argument to --with-clang-path is not a file: {}
         '''.format(clang_path)))
 
     return namespace(
         libclang_path=libclang_path[0],
         clang_path=clang_path[0],
     )
 
-@depends(stylo_config, bindgen_config_paths, '--enable-stylo-build-bindgen')
-@imports(_from='textwrap', _import='dedent')
-def stylo(stylo_config, bindgen_config_paths, bindgen_enabled):
-    if not stylo_config.build:
-        return None
-    elif not bindgen_enabled:
-        return namespace(
-            build=bool(stylo_config.build)
-        )
-
-    return namespace(
-        libclang_path=bindgen_config_paths.libclang_path,
-        clang_path=bindgen_config_paths.clang_path,
-    )
-
 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_LIBCLANG_PATH', bindgen_config_paths.libclang_path)
+set_config('MOZ_CLANG_PATH', bindgen_config_paths.clang_path)
 set_config('MOZ_STYLO_BINDGEN', depends_if('--enable-stylo-build-bindgen')(lambda _: True))
 
 option('--with-servo', env='SERVO_TARGET_DIR', nargs=1,
        help='Absolute path of the target directory where libgeckoservo can '
             'be found. This is generally servo_src_dir/target/release.')
 
 @depends_if('--with-servo')
 def servo_target_dir(value):