Bug 1035125 Part 5: Back out changeset baa3f852133b and associated subsequent changes. r=glandium
authorBob Owen <bobowencode@gmail.com>
Sun, 15 May 2016 16:23:57 +0100
changeset 297623 3b9b7b90c5f4dc1ec36d578bea8b3d29616a21c7
parent 297622 8de111c0df7c064c392ce68110d6111c8087b90f
child 297624 89c0989d9cf96e6e1462174c9941d5aea66156f9
push id76830
push userbobowencode@gmail.com
push dateTue, 17 May 2016 07:42:57 +0000
treeherdermozilla-inbound@a416c55e6648 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1035125, 1023941
milestone49.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 1035125 Part 5: Back out changeset baa3f852133b and associated subsequent changes. r=glandium The original changeset that is being backed out had comment: Bug 1023941 - Part 1: Static-link the CRT into firefox.exe. MozReview-Commit-ID: FPqXvdajdo3
browser/app/moz.build
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -1,20 +1,17 @@
 # -*- 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 += ['profile/extensions']
 
-if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_ASAN']:
-    GeckoProgram(CONFIG['MOZ_APP_NAME'])
-else:
-    GeckoProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static')
+GeckoProgram(CONFIG['MOZ_APP_NAME'])
 
 JS_PREFERENCE_PP_FILES += [
     'profile/firefox.js',
 ]
 
 SOURCES += [
     'nsBrowserApp.cpp',
 ]
@@ -27,20 +24,16 @@ DEFINES['APP_VERSION'] = CONFIG['MOZ_APP
 
 LOCAL_INCLUDES += [
     '!/build',
     '/toolkit/xre',
     '/xpcom/base',
     '/xpcom/build',
 ]
 
-DELAYLOAD_DLLS += [
-    'mozglue.dll',
-]
-
 USE_LIBS += [
     'mozglue',
 ]
 
 if CONFIG['_MSC_VER']:
     # Always enter a Windows program through wmain, whether or not we're
     # a console application.
     WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']