Bug 1575783 - Fix bug 1551639 after bug 1573566. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 22 Aug 2019 14:23:05 +0000
changeset 553255 4dfe4abe05d8b9c7c692c7187df7435674a6d8b7
parent 553254 4c01978f7732440a45d045b2c0b352f301f6db2c
child 553256 78fe0feeb890e43c55bae33bcf2d2839921e1870
push id2165
push userffxbld-merge
push dateMon, 14 Oct 2019 16:30:58 +0000
treeherdermozilla-release@0eae18af659f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1575783, 1551639, 1573566
milestone70.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 1575783 - Fix bug 1551639 after bug 1573566. r=froydnj Bug 1573566 moved libxul in a subdirectory, which means the list of files it links are now relative to that directory, rather than the directory where buildid.cpp is. So the dependencies for buildid.cpp need to account for that. Differential Revision: https://phabricator.services.mozilla.com/D43032
toolkit/library/gen_buildid.py
--- a/toolkit/library/gen_buildid.py
+++ b/toolkit/library/gen_buildid.py
@@ -29,10 +29,10 @@ def main(output, input_file):
 
     pp = Preprocessor()
     pp.out = StringIO()
     pp.do_include(os.path.join(buildconfig.topobjdir, 'buildid.h'))
     buildid = pp.context['MOZ_BUILDID']
     output.write(
         'extern const char gToolkitBuildID[] = "%s";' % buildid
     )
-    return set(o for o in objs
+    return set(os.path.join('build', o) for o in objs
                if os.path.splitext(os.path.basename(o))[0] != 'buildid')