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.
--- 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)
