Bug 1035125 Part 5: Back out changeset baa3f852133b and associated subsequent changes. r?glandium draft
authorBob Owen <bobowencode@gmail.com>
Sun, 15 May 2016 16:23:57 +0100
changeset 367182 307a9453196e9d412d5efd2d7d0c1bcb86e5d33b
parent 367181 490e39a9575c35a8a197594753c7879d1fbd960a
child 367183 c6ed4637b2963252d4bbbd8bb2a1aae7a4a80423
push id18159
push userbobowencode@gmail.com
push dateSun, 15 May 2016 15:37:30 +0000
reviewersglandium
bugs1035125, 1023941
milestone49.0a1
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']