Back out 5d5a9bb4cd6c (bug 941854) because of build errors on a CLOSED TREE
authorMatt Brubeck <mbrubeck@mozilla.com>
Mon, 25 Nov 2013 18:04:14 -0800
changeset 157463 7d65b8146dbdde3d68381caa842550a0e8dd019d
parent 157462 1df327c93b8d8e3530a53b4d51ad1b5fdf349836
child 157464 34e95dfdc1261496ed892ecd13933516303ee5c0
push id36726
push usermbrubeck@mozilla.com
push dateTue, 26 Nov 2013 02:04:57 +0000
treeherdermozilla-inbound@7d65b8146dbd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs941854
milestone28.0a1
backs out5d5a9bb4cd6c3df7fa086c1c64d837aa7ead0a25
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
Back out 5d5a9bb4cd6c (bug 941854) because of build errors on a CLOSED TREE
python/mozbuild/mozbuild/backend/recursivemake.py
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -368,18 +368,17 @@ class RecursiveMakeBackend(CommonBackend
                         self._add_unified_build_rules(backend_file, v,
                             backend_file.objdir,
                             unified_prefix='Unified_%s_%s' % (
                                 unified_suffixes[k],
                                 backend_file.relobjdir.replace('/', '_')),
                             unified_suffix=unified_suffixes[k],
                             unified_files_makefile_variable=k,
                             include_curdir_build_rules=False,
-                            files_per_unified_file=files_per_unification,
-                            unified_checks=True)
+                            files_per_unified_file=files_per_unification)
                         backend_file.write('%s += $(%s)\n' % (k[len('UNIFIED_'):], k))
                     else:
                         backend_file.write('%s += %s\n' % (
                             k[len('UNIFIED_'):], ' '.join(sorted(v))))
                 elif isinstance(v, list):
                     for item in v:
                         backend_file.write('%s += %s\n' % (k, item))
                 elif isinstance(v, bool):
@@ -595,17 +594,16 @@ class RecursiveMakeBackend(CommonBackend
 
     def _add_unified_build_rules(self, makefile, files, output_directory,
                                  unified_prefix='Unified',
                                  unified_suffix='cpp',
                                  extra_dependencies=[],
                                  unified_files_makefile_variable='unified_files',
                                  include_curdir_build_rules=True,
                                  poison_windows_h=False,
-                                 unified_checks=False,
                                  files_per_unified_file=16):
 
         explanation = "\n" \
             "# We build files in 'unified' mode by including several files\n" \
             "# together into a single source file.  This cuts down on\n" \
             "# compilation times and debug information size.  %d was chosen as\n" \
             "# a reasonable compromise between clobber rebuild time, incremental\n" \
             "# rebuild time, and compiler memory usage." % files_per_unified_file
@@ -649,29 +647,16 @@ class RecursiveMakeBackend(CommonBackend
                 f.write('#define MOZ_UNIFIED_BUILD\n')
                 includeTemplate = '#include "%(cppfile)s"'
                 if poison_windows_h:
                     includeTemplate += (
                         '\n'
                         '#ifdef _WINDOWS_\n'
                         '#error "%(cppfile)s included windows.h"\n'
                         "#endif")
-                if unified_checks:
-                    includeTemplate += (
-                        '\n'
-                        '#ifdef PL_ARENA_CONST_ALIGN_MASK\n'
-                        '#error "%(cppfile)s uses PL_ARENA_CONST_ALIGN_MASK, '
-                        'so it cannot be built in unified mode."\n'
-                        '#undef PL_ARENA_CONST_ALIGN_MASK\n'
-                        '#endif\n'
-                        '#ifdef FORCE_PR_LOG\n'
-                        '#error "%(cppfile)s forces NSPR logging, '
-                        'so it cannot be built in unified mode."\n'
-                        '#undef FORCE_PR_LOG\n'
-                        '#endif')
                 f.write('\n'.join(includeTemplate % { "cppfile": s } for
                                   s in source_filenames))
 
         if include_curdir_build_rules:
             makefile.add_statement('\n'
                 '# Make sometimes gets confused between "foo" and "$(CURDIR)/foo".\n'
                 '# Help it out by explicitly specifiying dependencies.')
             makefile.add_statement('all_absolute_unified_files := \\\n'