Bug 1519319 - Move bindgen.configure include to js/moz.configure. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 11 Jan 2019 22:17:54 +0000
changeset 453584 b9d64807cd97fae903cf2fae57c0042b7085f365
parent 453583 027d42f23d2dc4979d6f9fde3b5883fe4c14bd43
child 453585 0355f47af6ceab050018e9c27fc9d9c4bb944662
push id111111
push usernbeleuzu@mozilla.com
push dateSat, 12 Jan 2019 09:47:12 +0000
treeherdermozilla-inbound@a44934afe25e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1519319
milestone66.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 1519319 - Move bindgen.configure include to js/moz.configure. r=froydnj Bindgen is only used when building js or toolkit, so we only need to include the configure part in js/moz.configure, which is included in both cases. Depends on D16293 Differential Revision: https://phabricator.services.mozilla.com/D16294
js/moz.configure
moz.configure
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -13,16 +13,18 @@ def building_js(build_project):
 
 # Exception to the rule above: JS_STANDALONE is a special option that doesn't
 # want the js_option treatment. When we're done merging js/src/configure and
 # top-level configure, it can go away, although the JS_STANDALONE config
 # will still need to be set depending on building_js above.
 option(env='JS_STANDALONE', default=building_js,
        help='Reserved for internal use')
 
+include('../build/moz.configure/bindgen.configure',
+        when='--enable-compile-environment')
 include('../build/moz.configure/rust.configure',
         when='--enable-compile-environment')
 
 @depends('JS_STANDALONE')
 def js_standalone(value):
     if value:
         return True
 set_config('JS_STANDALONE', js_standalone)
--- a/moz.configure
+++ b/moz.configure
@@ -232,19 +232,16 @@ set_config('RUST_LIB_PREFIX', library_na
 set_config('RUST_LIB_SUFFIX', library_name_info.rust_lib.suffix)
 set_config('OBJ_SUFFIX', library_name_info.obj.suffix)
 # Lots of compilation tests depend on this variable being present.
 add_old_configure_assignment('OBJ_SUFFIX', library_name_info.obj.suffix)
 set_config('IMPORT_LIB_SUFFIX', library_name_info.import_lib.suffix)
 set_define('MOZ_DLL_PREFIX', depends(library_name_info.dll.prefix)(lambda s: '"%s"' % s))
 set_define('MOZ_DLL_SUFFIX', depends(library_name_info.dll.suffix)(lambda s: '"%s"' % s))
 
-# Depends on host_library_name_info, so needs to go here.
-include('build/moz.configure/bindgen.configure',
-        when='--enable-compile-environment')
 include(include_project_configure)
 
 @depends('--help')
 @imports(_from='mozbuild.backend', _import='backends')
 def build_backends_choices(_):
     return tuple(backends)