Bug 1306138 - Include project-specific moz.configure at a later time. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 28 Sep 2016 15:26:23 +0900
changeset 315953 0e13038823b5d200467b7a3bc8f2715c34964ac3
parent 315952 42722bb6b23c21a26dd80b59289f4cca05b701e8
child 315954 314075c09505c28c056f8f44f37acfd28342edca
push id82314
push usercbook@mozilla.com
push dateFri, 30 Sep 2016 10:08:37 +0000
treeherdermozilla-inbound@33d05c77b5c6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1306138
milestone52.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 1306138 - Include project-specific moz.configure at a later time. r=chmanchester It is unfortunately not possible to include it last (or close to last, before old.configure), but at least putting it after toolchain related includes will be helpful.
build/moz.configure/init.configure
moz.configure
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -811,10 +811,8 @@ add_old_configure_assignment('PKG_CONFIG
 # Bug 1278542: This function is a workaround to resolve
 # |android_ndk_include|'s dependency on 'gonkdir.' The
 # actual implementation is located in b2g/moz.configure.
 # Remove this function as soon as 'android_ndk_include'
 # depends on 'target.'
 @dependable
 def gonkdir():
     return None
-
-include(include_project_configure)
--- a/moz.configure
+++ b/moz.configure
@@ -97,16 +97,17 @@ include_when('build/moz.configure/toolch
              when='--enable-compile-environment')
 include_when('build/moz.configure/memory.configure',
              when='--enable-compile-environment')
 include_when('build/moz.configure/headers.configure',
              when='--enable-compile-environment')
 include_when('build/moz.configure/warnings.configure',
              when='--enable-compile-environment')
 
+include(include_project_configure)
 
 @depends(building_js, '--help')
 def ctypes_default(building_js, _):
     return not building_js
 
 js_option('--enable-ctypes', help='Enable js-ctypes',
           default=ctypes_default)