On 2015-01-16 5:06 PM, Chris Peterson wrote:
On 1/16/15 12:17 PM, Ehsan Akhgari wrote:
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py
b/python/mozbuild/mozbuild/backend/recursivemake.py
index 608f6f5..de754b6 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -394,7 +394,7 @@ class RecursiveMakeBackend(CommonBackend):
non_unified_var = var[len('UNIFIED_'):]
files_per_unification = obj.files_per_unified_file
- do_unify = files_per_unification > 1
+ do_unify = False
# Sorted so output is consistent and we don't bump
mtimes.
source_files = list(sorted(obj.files))
This is a little cryptic, but something similar to this does seem
preferable to keeping all of the code for --disable-unified-compilation.
It just needs to be discoverable by the people who would usefully
discover it.
Can you think of something better/more obvious?
recursivemake.py could allow the user to override files_per_unification
with an environment variable like MOZ_FILES_PER_UNIFICATION or
MOZ_DISABLE_UNIFIED_COMPILATION (files_per_unification = 1). This would
not depend on mozconfig and configure support for
--disable-unified-compilation.
I prefer the environment variable.
But I urge everyone to please wait to see if we start getting fixes for
non-unified builds from now on before adding this.
_______________________________________________
dev-platform mailing list
dev-platform@lists.mozilla.org
https://lists.mozilla.org/listinfo/dev-platform
