Bug 1023941 - Part 4: Static-link the CRT into crashreporter.exe. r=ted
authorDavid Major <dmajor@mozilla.com>
Thu, 28 Aug 2014 14:51:25 +1200
changeset 223736 3c59642f6445c2262562d82f20de24ce022873d3
parent 223735 fa15c3e929d0709386f635b90f9fd0345b834f19
child 223737 1910714b56c64101bdd58e518c43e9248c5ed461
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1023941
milestone34.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 1023941 - Part 4: Static-link the CRT into crashreporter.exe. r=ted
toolkit/crashreporter/breakpad-windows-libxul/moz.build
toolkit/crashreporter/breakpad-windows-libxul/staticruntime/moz.build
toolkit/crashreporter/client/moz.build
--- a/toolkit/crashreporter/breakpad-windows-libxul/moz.build
+++ b/toolkit/crashreporter/breakpad-windows-libxul/moz.build
@@ -1,14 +1,18 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+DIRS += [
+    'staticruntime'
+]
+
 SOURCES += [
     '../google-breakpad/src/common/windows/http_upload.cc',
 ]
 
 LIBRARY_NAME = 'google_breakpad_libxul_s'
 
 FINAL_LIBRARY = 'xul'
 
copy from toolkit/crashreporter/breakpad-windows-libxul/moz.build
copy to toolkit/crashreporter/breakpad-windows-libxul/staticruntime/moz.build
--- a/toolkit/crashreporter/breakpad-windows-libxul/moz.build
+++ b/toolkit/crashreporter/breakpad-windows-libxul/staticruntime/moz.build
@@ -1,21 +1,19 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
-    '../google-breakpad/src/common/windows/http_upload.cc',
+    '../../google-breakpad/src/common/windows/http_upload.cc',
 ]
 
-LIBRARY_NAME = 'google_breakpad_libxul_s'
-
-FINAL_LIBRARY = 'xul'
+LIBRARY_NAME = 'google_breakpad_libxul_staticruntime_s'
 
 for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD', 'NOMINMAX'):
     DEFINES[var] = True
 
 LOCAL_INCLUDES += [
     '/toolkit/crashreporter/google-breakpad/src',
 ]
 
@@ -25,8 +23,9 @@ include('/toolkit/crashreporter/google-b
 include('/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mozbuild')
 
 SOURCES += objs_common
 SOURCES += objs_crash_generation
 SOURCES += objs_handler
 SOURCES += objs_sender
 
 DISABLE_STL_WRAPPING = True
+USE_STATIC_LIBS = True
--- a/toolkit/crashreporter/client/moz.build
+++ b/toolkit/crashreporter/client/moz.build
@@ -17,24 +17,25 @@ LOCAL_INCLUDES += [
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     UNIFIED_SOURCES += [
         'crashreporter_win.cpp',
     ]
     DEFINES['UNICODE'] = True
     DEFINES['_UNICODE'] = True
     USE_LIBS += [
-        'google_breakpad_libxul_s',
+        'google_breakpad_libxul_staticruntime_s',
     ]
     OS_LIBS += [
         'comctl32',
         'shell32',
         'wininet',
         'shlwapi',
     ]
+    USE_STATIC_LIBS = True
 elif CONFIG['OS_ARCH'] == 'Darwin':
     UNIFIED_SOURCES += [
         'crashreporter_osx.mm',
         'crashreporter_unix_common.cpp',
     ]
     LOCAL_INCLUDES += [
         '../google-breakpad/src/common/mac',
     ]