Merge inbound to mozilla-central a=merge
authorarthur.iakab <aiakab@mozilla.com>
Thu, 22 Aug 2019 12:52:11 +0300
changeset 489365 dcfcd7909aff0ef81a3b884ead0745645c6d6670
parent 489363 152bfc05a5091be5d366580d6cbdd1e6fd54eb79 (current diff)
parent 489364 aab4f9e088d1a5d9d39ec4c48103cd3c5b8e001a (diff)
child 489366 5e6ec638d2c2ee917bc0d1d076041afc332741d5
child 489401 046093029373072067a9f84e79dc87c1ea969a82
push id36470
push useraiakab@mozilla.com
push dateThu, 22 Aug 2019 09:54:39 +0000
treeherdermozilla-central@dcfcd7909aff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone70.0a1
first release with
nightly linux32
dcfcd7909aff / 70.0a1 / 20190822095439 / files
nightly linux64
dcfcd7909aff / 70.0a1 / 20190822095439 / files
nightly mac
dcfcd7909aff / 70.0a1 / 20190822095439 / files
nightly win32
dcfcd7909aff / 70.0a1 / 20190822095439 / files
nightly win64
dcfcd7909aff / 70.0a1 / 20190822095439 / 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
Merge inbound to mozilla-central a=merge
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -368,10 +368,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
 # libxul is rebuilt, we refresh the buildid and link it into libxul.
 SOURCES += ['!buildid.cpp']
 GENERATED_FILES += ['buildid.cpp']
 GENERATED_FILES['buildid.cpp'].script = 'gen_buildid.py'
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
     libxul_list = 'XUL'
 else:
     libxul_list = '%sxul_%s' % (
-        CONFIG['DLL_PREFIX'], CONFIG['DLL_SUFFIX'].lstrip('.'))
+        CONFIG['DLL_PREFIX'], CONFIG['DLL_SUFFIX'].lstrip('.').replace('.','_'))
 GENERATED_FILES['buildid.cpp'].inputs = ['!build/%s.list' % libxul_list]