Bug 973313 - Remove reference to vccorlib. r=jimm
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Tue, 18 Feb 2014 01:20:19 +0900
changeset 169131 8fa60c3a947ed4513c42503e612a7f4275da7eb7
parent 169130 da1ef4e7b2695377e0194d12f756a129b6d49838
child 169132 fefba9d06e0365cd9078adc67e1e7e0639a6e392
push id26233
push userphilringnalda@gmail.com
push dateMon, 17 Feb 2014 23:08:57 +0000
treeherdermozilla-central@4f9f58d41eac [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs973313
milestone30.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 973313 - Remove reference to vccorlib. r=jimm
browser/installer/package-manifest.in
toolkit/library/moz.build
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -87,25 +87,19 @@
 @BINPATH@/plugin-hang-ui@BIN_SUFFIX@
 #ifndef MOZ_DEBUG
 #if MOZ_MSVC_REDIST == 1600
 @BINPATH@/msvcp100.dll
 @BINPATH@/msvcr100.dll
 #elif MOZ_MSVC_REDIST == 1700
 @BINPATH@/msvcp110.dll
 @BINPATH@/msvcr110.dll
-#ifdef MOZ_METRO
-@BINPATH@/vccorlib110.dll
-#endif
 #elif MOZ_MSVC_REDIST == 1800
 @BINPATH@/msvcp120.dll
 @BINPATH@/msvcr120.dll
-#ifdef MOZ_METRO
-@BINPATH@/vccorlib120.dll
-#endif
 #endif
 #endif
 #endif
 #ifndef MOZ_NATIVE_ICU
 #ifdef MOZ_SHARED_ICU
 #ifdef XP_WIN
 #ifdef MOZ_DEBUG
 @BINPATH@/icudtd@MOZ_ICU_VERSION@.dll
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -73,20 +73,16 @@ DELAYLOAD_DLLS += [
     'rasapi32.dll',
     'rasdlg.dll',
     'secur32.dll',
     'wininet.dll',
     'winspool.drv'
 ]
 
 if CONFIG['MOZ_METRO']:
-    if CONFIG['MOZ_DEBUG']:
-        DELAYLOAD_DLLS += ['VCCORLIB' + CONFIG['CRTDLLVERSION'] + 'D.DLL']
-    else:
-        DELAYLOAD_DLLS += ['VCCORLIB' + CONFIG['CRTDLLVERSION'] + '.DLL']
     DELAYLOAD_DLLS += [
         'API-MS-WIN-CORE-WINRT-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL',
         'API-MS-WIN-CORE-WINRT-STRING-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL',
         'uiautomationcore.dll'
     ]
 
 if CONFIG['ACCESSIBILITY']:
     DELAYLOAD_DLLS += ['oleacc.dll']