Bug 908977 - Build all XPIDLs when performing a partial tree build; r=glandium
authorGregory Szorc <gps@mozilla.com>
Sun, 25 Aug 2013 19:21:18 -0700
changeset 152268 06ec05a75711cafd7bbd714365a1e99b00e3bd78
parent 152267 1a6fa04f0c9e08fba2e2abf77a482a1efd0e4c3d
child 152269 298a72a6c39cb973de8f919da49330b914912316
push idunknown
push userunknown
push dateunknown
reviewersglandium
bugs908977
milestone26.0a1
Bug 908977 - Build all XPIDLs when performing a partial tree build; r=glandium
python/mozbuild/mozbuild/backend/recursivemake.py
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -97,22 +97,24 @@ class BackendMakeFile(object):
 
     def write(self, buf):
         self.fh.write(buf)
 
     def close(self):
         if self.xpt_name:
             self.fh.write('XPT_NAME := %s\n' % self.xpt_name)
 
+            # We just recompile all xpidls because it's easier and less error
+            # prone.
             self.fh.write('NONRECURSIVE_TARGETS += export\n')
             self.fh.write('NONRECURSIVE_TARGETS_export += xpidl\n')
             self.fh.write('NONRECURSIVE_TARGETS_export_xpidl_DIRECTORY = '
-                '$(DEPTH)/config/makefiles/xpidl\n')
+                '$(DEPTH)/config/makefiles/precompile\n')
             self.fh.write('NONRECURSIVE_TARGETS_export_xpidl_TARGETS += '
-                'xpt/%s' % self.xpt_name)
+                'xpidl\n')
 
         return self.fh.close()
 
 
 class RecursiveMakeBackend(CommonBackend):
     """Backend that integrates with the existing recursive make build system.
 
     This backend facilitates the transition from Makefile.in to moz.build