Bug 1441275 - ignore js/src/shell OBJDIR_FILES in the tup backend; r=chmanchester
authorMike Shal <mshal@mozilla.com>
Thu, 22 Feb 2018 16:15:18 -0500
changeset 405585 bb14b807a77d3383abaa70b7f23bf70953290ae8
parent 405584 179c83a1d28b731b2258bfb371247db53f0835f5
child 405586 7e9df457d4b783ae1e479c3e9e0795e3af382fda
push id33525
push usernerli@mozilla.com
push dateWed, 28 Feb 2018 10:11:03 +0000
treeherdermozilla-central@9b1228043619 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1441275
milestone60.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 1441275 - ignore js/src/shell OBJDIR_FILES in the tup backend; r=chmanchester Without linking support in the tup backend, we don't produce a js binary, so we can't copy it via OBJDIR_FILES yet. MozReview-Commit-ID: AxqhHi84HIg
python/mozbuild/mozbuild/backend/tup.py
--- a/python/mozbuild/mozbuild/backend/tup.py
+++ b/python/mozbuild/mozbuild/backend/tup.py
@@ -416,17 +416,18 @@ class TupOnly(CommonBackend, PartialBack
                         any(mozpath.match(f.target_basename, p) for p in self._compile_env_gen_files)):
                         # If we have an artifact build we never would have generated this file,
                         # so do not attempt to install it.
                         continue
 
                     # We're not generating files in these directories yet, so
                     # don't attempt to install files generated from them.
                     if f.context.relobjdir not in ('layout/style/test',
-                                                   'toolkit/library'):
+                                                   'toolkit/library',
+                                                   'js/src/shell'):
                         output = mozpath.join('$(MOZ_OBJ_ROOT)', target, path,
                                               f.target_basename)
                         gen_backend_file = self._get_backend_file(f.context.relobjdir)
                         gen_backend_file.symlink_rule(f.full_path, output=output,
                                                       output_group=self._installed_files)
 
     def _process_final_target_pp_files(self, obj, backend_file):
         for i, (path, files) in enumerate(obj.files.walk()):