Bug 1510490 - Make tup build typenum. r=frodynj
authorKartikaya Gupta <kgupta@mozilla.com>
Sat, 01 Dec 2018 10:46:08 -0800
changeset 505536 d244292c2a12
parent 505535 e52996e78762
child 505537 5f0040d4be16
child 505589 3a943b45881a
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrodynj
bugs1510490
milestone65.0a1
first release with
nightly linux32
d244292c2a12 / 65.0a1 / 20181201213736 / files
nightly linux64
d244292c2a12 / 65.0a1 / 20181201213736 / files
nightly mac
d244292c2a12 / 65.0a1 / 20181201213736 / files
nightly win32
d244292c2a12 / 65.0a1 / 20181201213736 / files
nightly win64
d244292c2a12 / 65.0a1 / 20181201213736 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1510490 - Make tup build typenum. r=frodynj Differential Revision: https://phabricator.services.mozilla.com//D13619
python/mozbuild/mozbuild/backend/tup.py
--- a/python/mozbuild/mozbuild/backend/tup.py
+++ b/python/mozbuild/mozbuild/backend/tup.py
@@ -886,17 +886,17 @@ class TupBackend(CommonBackend):
             if (invocation['target_kind'][0] == 'staticlib' and
                 obj.basename == shortname):
                 command += cargo_library_flags
 
             outputs = invocation['outputs']
 
             invocation['full-deps'] = set()
 
-            if os.path.basename(invocation['program']) == 'build-script-build':
+            if os.path.basename(invocation['program']) in ['build-script-build', 'build-script-main']:
                 out_dir = invocation['env']['OUT_DIR']
                 for output in cargo_extra_outputs.get(shortname, []):
                     outputs.append(os.path.join(out_dir, output))
 
                 script_stdout = mozpath.join(out_dir,
                                              '%s_%s_build_out.txt' % (shortname,
                                                                       invocation['kind']))
                 command.extend(['>', script_stdout])