Bug 1441275 - ignore js/src/shell OBJDIR_FILES in the tup backend; r?Build draft
authorMike Shal <mshal@mozilla.com>
Thu, 22 Feb 2018 16:15:18 -0500
changeset 760120 c3214e1c1405365f741741a3d70ef6f5ed76d7ee
parent 759830 6d72eade26af359ffc3cd3e381fd79c88922b9b8
child 760121 e7c1bea9ab51a2f43ed4dc8a134a6d5a10732987
push id100546
push userbmo:mshal@mozilla.com
push dateMon, 26 Feb 2018 21:53:22 +0000
reviewersBuild
bugs1441275
milestone60.0a1
Bug 1441275 - ignore js/src/shell OBJDIR_FILES in the tup backend; r?Build 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()):