Bug 1174011, fix xulrunner-stub compile, r=gladium DONTBUILD
authorNick Thomas <nthomas@mozilla.com>
Fri, 07 Aug 2015 12:20:28 +1200
changeset 288383 2ac09126d207b8e8d4bcad0251c5f5d57d5a7b4a
parent 288382 a7054bcee797e83e8ce2359a0e572abf9fde886e
child 288384 f8159fd0e43c34eccbf7006bfd9df57385a25674
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgladium
bugs1174011
milestone42.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 1174011, fix xulrunner-stub compile, r=gladium DONTBUILD
xulrunner/stub/moz.build
--- a/xulrunner/stub/moz.build
+++ b/xulrunner/stub/moz.build
@@ -24,16 +24,18 @@ DEFINES['XPCOM_GLUE'] = True
 
 LOCAL_INCLUDES += [
     '/xpcom/base',
     '/xpcom/build',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     LOCAL_INCLUDES += ['/toolkit/xre']
+    # this is an awful workaround - glandium
+    USE_LIBS += ['mfbt_staticruntime']
 
 if CONFIG['_MSC_VER']:
     WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     DEFINES['MOZ_XULRUNNER'] = True
     RCINCLUDE = 'xulrunner-stub.rc'