From e4d6d847410a9bb44d06a16ec330461954ff1410 Mon Sep 17 00:00:00 2001
From: Bob Owen <bobowencode@gmail.com>
Date: Sun, 15 May 2016 16:23:57 +0100
Subject: [PATCH] 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

--HG--
extra : rebase_source : 9bdc9c7e1a34419c6812a5908f29f568fb9fe94b
---
 browser/app/moz.build | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/browser/app/moz.build b/browser/app/moz.build
index dc3342a9940b..51f9a8764d0f 100644
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -6,10 +6,7 @@
 
 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',
@@ -32,10 +29,6 @@ LOCAL_INCLUDES += [
     '/xpcom/build',
 ]
 
-DELAYLOAD_DLLS += [
-    'mozglue.dll',
-]
-
 USE_LIBS += [
     'mozglue',
 ]