mozilla-reduce-files-per-UnifiedBindings.patch
changeset 1006 5ba9b67de554
parent 903 83801946c93f
child 1045 f645c886d36b
equal deleted inserted replaced
1005:6d716caa6abe 1006:5ba9b67de554
    11 [ 1616s] {standard input}:316015: Warning: end of file not at end of a line; newline inserted
    11 [ 1616s] {standard input}:316015: Warning: end of file not at end of a line; newline inserted
    12 [ 1635s] {standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive
    12 [ 1635s] {standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive
    13 [ 1636s] c++: internal compiler error: Killed (program cc1plus)
    13 [ 1636s] c++: internal compiler error: Killed (program cc1plus)
    14 [ 1636s] Please submit a full bug report,
    14 [ 1636s] Please submit a full bug report,
    15 
    15 
    16 Index: mozilla/python/mozbuild/mozbuild/backend/common.py
    16 diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py
    17 ===================================================================
    17 --- a/python/mozbuild/mozbuild/backend/common.py
    18 --- mozilla.orig/python/mozbuild/mozbuild/backend/common.py	2016-02-26 17:19:30.331667693 +0100
    18 +++ b/python/mozbuild/mozbuild/backend/common.py
    19 +++ mozilla/python/mozbuild/mozbuild/backend/common.py	2016-02-26 17:19:39.792569676 +0100
    19 @@ -386,17 +386,17 @@ class CommonBackend(BuildBackend):
    20 @@ -333,7 +333,7 @@ class CommonBackend(BuildBackend):
    20          )
       
    21          self._handle_generated_sources(manager.expected_build_output_files())
       
    22          # Bindings are compiled in unified mode to speed up compilation and
       
    23          # to reduce linker memory size. Note that test bindings are separated
       
    24          # from regular ones so tests bindings aren't shipped.
    21          unified_source_mapping = list(group_unified_files(webidls.all_regular_cpp_basenames(),
    25          unified_source_mapping = list(group_unified_files(webidls.all_regular_cpp_basenames(),
    22                                                            unified_prefix='UnifiedBindings',
    26                                                            unified_prefix='UnifiedBindings',
    23                                                            unified_suffix='cpp',
    27                                                            unified_suffix='cpp',
    24 -                                                          files_per_unified_file=32))
    28 -                                                          files_per_unified_file=32))
    25 +                                                          files_per_unified_file=16))
    29 +                                                          files_per_unified_file=16))
    26          self._write_unified_files(unified_source_mapping, bindings_dir,
    30          self._write_unified_files(unified_source_mapping, bindings_dir,
    27                                    poison_windows_h=True)
    31                                    poison_windows_h=True)
    28          self._handle_webidl_build(bindings_dir, unified_source_mapping,
    32          self._handle_webidl_build(bindings_dir, unified_source_mapping,
       
    33                                    webidls,
       
    34                                    manager.expected_build_output_files(),
       
    35                                    manager.GLOBAL_DEFINE_FILES)
       
    36  
       
    37      def _write_unified_file(self, unified_file, source_filenames,