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

--HG--
extra : rebase_source : ae86450a61fae695da9f78644752e71eca65068c

toolkit/mozapps/installer/upload-files.mk

@@ -64,12 +64,6 @@ JSSHELL_BINS  = \
   $(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
@@ -81,6 +75,13 @@ ifndef MOZ_SYSTEM_NSPR
   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 += \