Bug 1257435 - Move MSVC runtime DLL code outside of MOZ_SYSTEM_NSPR block; r=glandium
authorGregory Szorc <gps@mozilla.com>
Thu, 17 Mar 2016 18:04:23 -0700
changeset 289436 48cc9c0818d01e51498959b0607724dfe8c9f4e8
parent 289435 69703aa2bad7349c95c549588db8bfbb3cac9a35
child 289437 c1a7ef0126e5296593e71b0922cd0d6eb12cead4
push id73843
push usergszorc@mozilla.com
push dateSat, 19 Mar 2016 01:34:38 +0000
treeherdermozilla-inbound@c1a7ef0126e5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1257435
milestone48.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 1257435 - Move MSVC runtime DLL code outside of MOZ_SYSTEM_NSPR block; r=glandium Why it was the old way, I'm not sure. MozReview-Commit-ID: FMmDbZI0NqL
toolkit/mozapps/installer/upload-files.mk
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -59,33 +59,34 @@ endif
 
 # JavaScript Shell packaging
 JSSHELL_BINS  = \
   js$(BIN_SUFFIX) \
   $(DLL_PREFIX)mozglue$(DLL_SUFFIX) \
   $(NULL)
 
 ifndef MOZ_SYSTEM_NSPR
-  ifdef MSVC_C_RUNTIME_DLL
-    JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL)
-  endif
-  ifdef MSVC_CXX_RUNTIME_DLL
-    JSSHELL_BINS += $(MSVC_CXX_RUNTIME_DLL)
-  endif
   ifdef MOZ_FOLD_LIBS
     JSSHELL_BINS += $(DLL_PREFIX)nss3$(DLL_SUFFIX)
   else
     JSSHELL_BINS += \
       $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
       $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
       $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
       $(NULL)
   endif # MOZ_FOLD_LIBS
 endif # MOZ_SYSTEM_NSPR
 
+ifdef MSVC_C_RUNTIME_DLL
+  JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL)
+endif
+ifdef MSVC_CXX_RUNTIME_DLL
+  JSSHELL_BINS += $(MSVC_CXX_RUNTIME_DLL)
+endif
+
 ifdef MOZ_SHARED_ICU
 ifeq ($(OS_TARGET), WINNT)
 JSSHELL_BINS += \
   icudt$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
   icuin$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
   icuuc$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
   $(NULL)
 else