Bug 1108750 - part 4 - remove handling of extra_dependencies from _add_unified_build_rules; r=mshal
authorNathan Froyd <froydnj@mozilla.com>
Mon, 19 Jan 2015 15:07:43 -0500
changeset 239739 e80c66667c38b7ceb48d9e47db67c4d401252f39
parent 239738 e0a55a8b70bfce0b9b3b8ed8020b01de5eca13a9
child 239740 3951263969f85d9c69cb0d5fc6d8a093184d9068
push id506
push usermleibovic@mozilla.com
push dateThu, 29 Jan 2015 12:40:10 +0000
reviewersmshal
bugs1108750
milestone38.0a1
Bug 1108750 - part 4 - remove handling of extra_dependencies from _add_unified_build_rules; r=mshal No callers use it, and the makefile rules it generates don't really do anything that the compiler won't already infer. Let's get rid of it.
python/mozbuild/mozbuild/backend/recursivemake.py
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -607,17 +607,16 @@ class RecursiveMakeBackend(CommonBackend
             root_mk.dump(root, removal_guard=False)
 
         with self._write_file(
                 mozpath.join(self.environment.topobjdir, 'root-deps.mk')) as root_deps:
             root_deps_mk.dump(root_deps, removal_guard=False)
 
     def _add_unified_build_rules(self, makefile, unified_source_mapping,
                                  output_directory,
-                                 extra_dependencies=[],
                                  unified_files_makefile_variable='unified_files',
                                  include_curdir_build_rules=True,
                                  poison_windows_h=False):
 
         # In case it's a generator.
         unified_source_mapping = sorted(unified_source_mapping)
 
         explanation = "\n" \
@@ -626,20 +625,16 @@ class RecursiveMakeBackend(CommonBackend
             "# compilation times and debug information size."
         makefile.add_statement(explanation)
 
         all_sources = ' '.join(source for source, _ in unified_source_mapping)
         makefile.add_statement('%s := %s' % (unified_files_makefile_variable,
                                              all_sources))
 
         for unified_file, source_filenames in unified_source_mapping:
-            if extra_dependencies:
-                rule = makefile.create_rule([unified_file])
-                rule.add_dependencies(extra_dependencies)
-
             # The rule we just defined is only for cases where the cpp files get
             # blown away and we need to regenerate them.  The rule doesn't correctly
             # handle source files being added/removed/renamed.  Therefore, we
             # generate them here also to make sure everything's up-to-date.
             self._write_unified_file(unified_file, source_filenames,
                                      output_directory,
                                      poison_windows_h=poison_windows_h)