Bug 1047702 - recursivemake's scan for Makefiles with XPI_PKGNAME or INSTALL_EXTENSION_ID should take account of comm-central r=glandium
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sat, 02 Aug 2014 02:52:52 +0100
changeset 197567 2f0e480f298c2ec174ca38afeae8bd2606d38524
parent 197566 92e7ef3f7aa53e59e81f5bd237736f9aa56ae8ee
child 197568 e9c94e412090500a98fccd6464a6822f2b48ef1c
push id27249
push userryanvm@gmail.com
push dateMon, 04 Aug 2014 20:14:35 +0000
treeherdermozilla-central@7f81be7db528 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1047702
milestone34.0a1
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
Bug 1047702 - recursivemake's scan for Makefiles with XPI_PKGNAME or INSTALL_EXTENSION_ID should take account of comm-central r=glandium
python/mozbuild/mozbuild/backend/recursivemake.py
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -728,20 +728,20 @@ class RecursiveMakeBackend(CommonBackend
                     # containing a tools target, or XPI_PKGNAME or
                     # INSTALL_EXTENSION_ID.
                     for t in (b'XPI_PKGNAME', b'INSTALL_EXTENSION_ID',
                             b'tools'):
                         if t not in content:
                             continue
                         if t == b'tools' and not re.search('(?:^|\s)tools.*::', content, re.M):
                             continue
-                        if objdir == bf.environment.topobjdir:
+                        if objdir == self.environment.topobjdir:
                             continue
                         self._no_skip['tools'].add(mozpath.relpath(objdir,
-                            bf.environment.topobjdir))
+                            self.environment.topobjdir))
 
         # Write out a master list of all IPDL source files.
         ipdl_dir = mozpath.join(self.environment.topobjdir, 'ipc', 'ipdl')
         mk = mozmakeutil.Makefile()
 
         sorted_ipdl_sources = list(sorted(self._ipdl_sources))
         mk.add_statement('ALL_IPDLSRCS := %s' % ' '.join(sorted_ipdl_sources))